Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion importlib_metadata/_adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ class Message(email.message.Message):
FoldedCase,
[
'Classifier',
'Import-Name',
'Import-Namespace',
'License-File',
'Obsoletes-Dist',
'Platform',
'Project-URL',
Expand All @@ -72,7 +75,7 @@ class Message(email.message.Message):
)
)
"""
Keys that may be indicated multiple times per PEP 566.
Keys that may be indicated multiple times in Core Metadata.
"""

def __new__(cls, orig: email.message.Message):
Expand Down
1 change: 1 addition & 0 deletions newsfragments/+json-multiple-use.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Return ``License-File``, ``Import-Name``, and ``Import-Namespace`` as lists in JSON-compatible metadata, including when only one value is present, and retain all repeated values as required by PEP 566.
23 changes: 23 additions & 0 deletions tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,29 @@ def test_as_json_odd_case(self):
assert len(md['requires_dist']) == 2
assert md['keywords'] == ['SAMPLE', 'PACKAGE']

@fixtures.parameterize(
dict(key='License-File', values=['LICENSE', 'NOTICE']),
dict(key='Import-Name', values=['example', '_example ; private']),
dict(key='Import-Namespace', values=['example', 'another']),
dict(key='Import-Name', values=['']),
)
def test_as_json_recent_multiple_use_fields(self, key, values):
for count in range(1, len(values) + 1):
with self.subTest(count=count):
selected = values[:count]
headers = '\n'.join(
f'{key if index == 0 else key.upper()}: {value}'
for index, value in enumerate(selected)
)
content = (
'Metadata-Version: 2.5\nName: distinfo-pkg\nVersion: 1.0.0\n'
+ headers
)
path = self.site_dir / 'distinfo_pkg-1.0.0.dist-info' / 'METADATA'
path.write_text(content, encoding='utf-8')
md = metadata('distinfo-pkg').json
assert md[key.lower().replace('-', '_')] == selected
Comment on lines +284 to +305

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there already tests for multi-use fields? If so, I'd prefer to re-use that test. "recent multiple use fields" will have a stale meaning as soon as this is committed.



class LegacyDots(fixtures.DistInfoPkgWithDotLegacy, unittest.TestCase):
def test_name_normalization(self):
Expand Down
Loading