diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2021-12-16 15:48:35 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2021-12-16 19:30:08 -0500 |
| commit | 1b0151f61b97d62920dd7d7ccac881f8d180f67f (patch) | |
| tree | c9912a296fab2ffe24a1ebf94107035209d960f8 | |
| parent | 4c1effaaee472cc67f3186411a3df4f39af3d71a (diff) | |
| download | cpython-git-backport-109d966-3.9.tar.gz | |
[3.9] bpo-46105: Honor spec when generating requirement specs with urls and extras. (GH-30151).backport-109d966-3.9
(cherry picked from commit 109d96602199a91e94eb14b8cb3720841f22ded7)
Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
| -rw-r--r-- | Lib/importlib/metadata.py | 15 | ||||
| -rw-r--r-- | Lib/test/test_importlib/test_metadata_api.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2021-12-16-14-30-36.bpo-46105.pprB1K.rst | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/Lib/importlib/metadata.py b/Lib/importlib/metadata.py index c6c7d31aa5..594986ce23 100644 --- a/Lib/importlib/metadata.py +++ b/Lib/importlib/metadata.py @@ -344,17 +344,26 @@ class Distribution: def make_condition(name): return name and 'extra == "{name}"'.format(name=name) - def parse_condition(section): + def quoted_marker(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 '' + def url_req_space(req): + """ + PEP 508 requires a space between the url_spec and the quoted_marker. + Ref python/importlib_metadata#357. + """ + # '@' is uniquely indicative of a url_req. + return ' ' * ('@' in req) + for section, deps in sections.items(): for dep in deps: - yield dep + parse_condition(section) + space = url_req_space(dep) + yield dep + space + quoted_marker(section) class DistributionFinder(MetaPathFinder): diff --git a/Lib/test/test_importlib/test_metadata_api.py b/Lib/test/test_importlib/test_metadata_api.py index 1d7b29ae05..420fbfeb3a 100644 --- a/Lib/test/test_importlib/test_metadata_api.py +++ b/Lib/test/test_importlib/test_metadata_api.py @@ -121,6 +121,7 @@ class APITests( [extra1] dep4 + dep6@ git+https://example.com/python/dep.git@v1.0.0 [extra2:python_version < "3"] dep5 @@ -132,6 +133,7 @@ class APITests( 'dep3; python_version < "3"', 'dep4; extra == "extra1"', 'dep5; (python_version < "3") and extra == "extra2"', + 'dep6@ git+https://example.com/python/dep.git@v1.0.0 ; extra == "extra1"', ] # It's important that the environment marker expression be # wrapped in parentheses to avoid the following 'and' binding more diff --git a/Misc/NEWS.d/next/Library/2021-12-16-14-30-36.bpo-46105.pprB1K.rst b/Misc/NEWS.d/next/Library/2021-12-16-14-30-36.bpo-46105.pprB1K.rst new file mode 100644 index 0000000000..145edccb2e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-12-16-14-30-36.bpo-46105.pprB1K.rst @@ -0,0 +1,2 @@ +Honor spec when generating requirement specs with urls and extras +(importlib_metadata 4.8.3). |