Skip to content

Commit

Permalink
bpo-38693: importlib.metadata f-strings (GH-26383)
Browse files Browse the repository at this point in the history
Automerge-Triggered-By: GH:jaraco
(cherry picked from commit e6c815d)

Co-authored-by: Jason R. Coombs <[email protected]>
  • Loading branch information
miss-islington and jaraco authored May 26, 2021
1 parent 1261941 commit 78a8428
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Lib/importlib/metadata/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,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):
Expand Down Expand Up @@ -385,7 +384,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:
Expand Down Expand Up @@ -569,13 +568,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 ''

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

0 comments on commit 78a8428

Please sign in to comment.