Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-02-13 19:04:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Automerge-Triggered-By: GH:jaraco
(cherry picked from commit e6c815d2e3)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
This commit is contained in:
Miss Islington (bot) 2021-05-26 12:11:41 -07:00 • committed by GitHub
parent 1261941e02
commit 78a8428548
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/importlib/metadata/__init__.py
View file

@ -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):
@ -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:
@ -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 ''

1
Misc/NEWS.d/next/Library/2021-05-26-13-34-37.bpo-33693.3okzdo.rst Normal file
View file

@ -0,0 +1 @@
Importlib.metadata now prefers f-strings to .format.