diff --git a/distutils/tests/compat/py39.py b/distutils/tests/compat/py39.py index 82468836..aca3939a 100644 --- a/distutils/tests/compat/py39.py +++ b/distutils/tests/compat/py39.py @@ -3,20 +3,38 @@ if sys.version_info >= (3, 10): from test.support.import_helper import ( CleanImport as CleanImport, + ) + from test.support.import_helper import ( DirsOnSysPath as DirsOnSysPath, ) from test.support.os_helper import ( EnvironmentVarGuard as EnvironmentVarGuard, + ) + from test.support.os_helper import ( rmtree as rmtree, + ) + from test.support.os_helper import ( skip_unless_symlink as skip_unless_symlink, + ) + from test.support.os_helper import ( unlink as unlink, ) else: from test.support import ( CleanImport as CleanImport, + ) + from test.support import ( DirsOnSysPath as DirsOnSysPath, + ) + from test.support import ( EnvironmentVarGuard as EnvironmentVarGuard, + ) + from test.support import ( rmtree as rmtree, + ) + from test.support import ( skip_unless_symlink as skip_unless_symlink, + ) + from test.support import ( unlink as unlink, ) diff --git a/ruff.toml b/ruff.toml index da3e3f8d..0d8179b3 100644 --- a/ruff.toml +++ b/ruff.toml @@ -46,10 +46,6 @@ ignore = [ "TRY400", ] -[lint.isort] -combine-as-imports = true -split-on-trailing-comma = false - [format] # Enable preview to get hugged parenthesis unwrapping and other nice surprises # See https://github.com/jaraco/skeleton/pull/133#issuecomment-2239538373