summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/importlib/metadata/__init__.py9
-rw-r--r--Misc/NEWS.d/next/Library/2021-05-26-13-34-37.bpo-33693.3okzdo.rst1
2 files changed, 5 insertions, 5 deletions
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
index 9637a82..94b8386 100644
--- 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 @@ class FileHash:
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 @@ class Distribution:
"""
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
new file mode 100644
index 0000000..2a568a4
--- /dev/null
+++ 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.