Merge pull request #353 from jakelishman/fix-disutils-removal

Reduce use of deprecated `distutils` module

setup.cfg

@@ -25,6 +25,11 @@ classifier =
     Topic :: Software Development :: Libraries :: Python Modules
     Topic :: Software Development :: Testing
 
+[options]
+install_requires =
+    # Purely to support the deprecated `TestCommand` until 3.0.
+    setuptools; python_version>='3.12'
+
 [extras]
 test =
   testscenarios

testtools/distutilscmd.py

@@ -5,8 +5,12 @@
 import sys
 import warnings
 
-from distutils.core import Command
-from distutils.errors import DistutilsOptionError
+try:
+    from setuptools import Command
+    from setuptools.errors import OptionError
+except ModuleNotFoundError:
+    from distutils.core import Command
+    from distutils.errors import DistutilsOptionError as OptionError
 
 from testtools.run import TestProgram, TestToolsTestRunner
 
@@ -47,12 +51,12 @@ def initialize_options(self):
     def finalize_options(self):
         if self.test_suite is None:
             if self.test_module is None:
-                raise DistutilsOptionError(
+                raise OptionError(
                     "You must specify a module or a suite to run tests from")
             else:
                 self.test_suite = self.test_module+".test_suite"
         elif self.test_module:
-            raise DistutilsOptionError(
+            raise OptionError(
                 "You may specify a module or a suite, but not both")
         self.test_args = [self.test_suite]
         if self.verbose: