bpo-38693: importlib.metadata f-strings (GH-26383)

jaraco · web-flow · commit e6c815d2e34b · 2021-05-26T11:49:06.000-07:00
Automerge-Triggered-By: GH:jaraco
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
@@ -48,8 +48,7 @@ class PackageNotFoundError(ModuleNotFoundError):
     """The package was not found."""
 
     def __str__(self):
-        tmpl = "No package metadata was found for {self.name}"
-        return tmpl.format(**locals())
+        return f"No package metadata was found for {self.name}"
 
     @property
     def name(self):
@@ -386,7 +385,7 @@ def __init__(self, spec):
         self.mode, _, self.value = spec.partition('=')
 
     def __repr__(self):
-        return '<FileHash mode: {} value: {}>'.format(self.mode, self.value)
+        return f'<FileHash mode: {self.mode} value: {self.value}>'
 
 
 class Distribution:
@@ -570,13 +569,13 @@ def _convert_egg_info_reqs_to_simple_reqs(sections):
         """
 
         def make_condition(name):
-            return name and 'extra == "{name}"'.format(name=name)
+            return name and f'extra == "{name}"'
 
         def parse_condition(section):
             section = section or ''
             extra, sep, markers = section.partition(':')
             if extra and markers:
-                markers = '({markers})'.format(markers=markers)
+                markers = f'({markers})'
             conditions = list(filter(None, [markers, make_condition(extra)]))
             return '; ' + ' and '.join(conditions) if conditions else ''
 
diff --git a/Misc/NEWS.d/next/Library/2021-05-26-13-34-37.bpo-33693.3okzdo.rst b/Misc/NEWS.d/next/Library/2021-05-26-13-34-37.bpo-33693.3okzdo.rst
@@ -0,0 +1 @@
+Importlib.metadata now prefers f-strings to .format.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Importlib.metadata now prefers f-strings to .format.`