Manual fixes after ruff check --fix runs

Author: DimitriPapadopoulos

pkg_resources/__init__.py

@@ -200,7 +200,9 @@ def get_supported_platform():
     m = macosVersionString.match(plat)
     if m is not None and sys.platform == "darwin":
         try:
-            plat = 'macosx-{}-{}'.format('.'.join(_macos_vers()[:2]), m.group(3))
+            major_minor = '.'.join(_macos_vers()[:2])
+            build = m.group(3)
+            plat = f'macosx-{major_minor}-{build}'
         except ValueError:
             # not macOS
             pass
@@ -2733,7 +2735,8 @@ def __str__(self) -> str:
         if self.attrs:
             s += ':' + '.'.join(self.attrs)
         if self.extras:
-            s += ' [{}]'.format(','.join(self.extras))
+            extras = ','.join(self.extras)
+            s += f' [{extras}]'
         return s
 
     def __repr__(self) -> str:
@@ -3319,8 +3322,8 @@ def check_version_conflict(self):
             ):
                 continue
             issue_warning(
-                f"Module {modname} was already imported from {fn}, but {self.location} is being added"
-                " to sys.path",
+                f"Module {modname} was already imported from {fn}, "
+                f"but {self.location} is being added to sys.path",
             )
 
     def has_version(self) -> bool:

setuptools/_core_metadata.py

@@ -178,8 +178,8 @@ def write_field(key, value):
     if license:
         write_field('License', rfc822_escape(license))
 
-    for project_url in self.project_urls.items():
-        write_field('Project-URL', '{}, {}'.format(*project_url))
+    for label, url in self.project_urls.items():
+        write_field('Project-URL', f'{label}, {url}')
 
     keywords = ','.join(self.get_keywords())
     if keywords:

setuptools/command/bdist_egg.py

@@ -69,7 +69,7 @@ def __bootstrap__():
 
 
 class bdist_egg(Command):
-    description = "create an \"egg\" distribution"
+    description = 'create an "egg" distribution'
 
     user_options = [
         ('bdist-dir=', 'b', "temporary directory for creating the distribution"),

setuptools/command/build_ext.py

@@ -168,7 +168,7 @@ def get_ext_filename(self, fullname: str) -> str:
             if not isinstance(ext_suffix, str):
                 raise OSError(
                     "Configuration variable EXT_SUFFIX not found for this platform "
-                    + "and environment variable SETUPTOOLS_EXT_SUFFIX is missing"
+                    "and environment variable SETUPTOOLS_EXT_SUFFIX is missing"
                 )
             so_ext = ext_suffix
 

setuptools/command/easy_install.py

@@ -132,8 +132,8 @@ class easy_install(Command):
         (
             'optimize=',
             'O',
-            "also compile with optimization: -O1 for \"python -O\", "
-            "-O2 for \"python -OO\", and -O0 to disable [default: -O0]",
+            'also compile with optimization: -O1 for "python -O", '
+            '-O2 for "python -OO", and -O0 to disable [default: -O0]',
         ),
         ('record=', None, "filename in which to record list of installed files"),
         ('always-unzip', 'Z', "don't install as a zipfile, no matter what"),
@@ -1024,7 +1024,8 @@ def install_exe(self, dist_filename, tmpdir):
                 f.write('Metadata-Version: 1.0\n')
                 for k, v in cfg.items('metadata'):
                     if k != 'target_version':
-                        f.write('{}: {}\n'.format(k.replace('_', '-').title(), v))
+                        k = k.replace('_', '-').title()
+                        f.write(f'{k}: {v}\n')
         script_dir = os.path.join(_egg_info, 'scripts')
         # delete entry-point scripts to avoid duping
         self.delete_blockers([

setuptools/dist.py

@@ -110,8 +110,7 @@ def check_nsp(dist, attr, value):
     for nsp in ns_packages:
         if not dist.has_contents_for(nsp):
             raise DistutilsSetupError(
-                "Distribution contains no modules or packages for "
-                + f"namespace package {nsp!r}"
+                f"Distribution contains no modules or packages for namespace package {nsp!r}"
             )
         parent, _sep, _child = nsp.rpartition('.')
         if parent and parent not in ns_packages:

setuptools/tests/config/test_setupcfg.py

@@ -87,24 +87,24 @@ def test_basic(self, tmpdir):
             '[options]\n'
             'scripts = bin/a.py, bin/b.py\n',
         )
-        config_dict = read_configuration(f'{config}')
+        config_dict = read_configuration(str(config))
         assert config_dict['metadata']['version'] == '10.1.1'
         assert config_dict['metadata']['keywords'] == ['one', 'two']
         assert config_dict['options']['scripts'] == ['bin/a.py', 'bin/b.py']
 
     def test_no_config(self, tmpdir):
         with pytest.raises(DistutilsFileError):
-            read_configuration('{}'.format(tmpdir.join('setup.cfg')))
+            read_configuration(str(tmpdir.join('setup.cfg')))
 
     def test_ignore_errors(self, tmpdir):
         _, config = fake_env(
             tmpdir,
             '[metadata]\nversion = attr: none.VERSION\nkeywords = one, two\n',
         )
         with pytest.raises(ImportError):
-            read_configuration(f'{config}')
+            read_configuration(str(config))
 
-        config_dict = read_configuration(f'{config}', ignore_option_errors=True)
+        config_dict = read_configuration(str(config), ignore_option_errors=True)
 
         assert config_dict['metadata']['keywords'] == ['one', 'two']
         assert 'version' not in config_dict['metadata']

setuptools/tests/test_build_ext.py

@@ -286,8 +286,8 @@ def test_build_ext_config_handling(tmpdir_cwd):
         ),
     }
     path.build(files)
-    code, output = environment.run_setup_py(
+    code, (stdout, stderr) = environment.run_setup_py(
         cmd=['build'],
         data_stream=(0, 2),
     )
-    assert code == 0, '\nSTDOUT:\n{}\nSTDERR:\n{}'.format(*output)
+    assert code == 0, f'\nSTDOUT:\n{stdout}\nSTDERR:\n{stderr}'