Use email.headerregistry.Address to format 'name <email@domain>'

pypa · Mar 12, 2021 · 43b7c54 · 43b7c54
1 parent 88dde16
commit 43b7c54
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/flit_core/flit_core/config.py b/flit_core/flit_core/config.py
@@ -1,4 1,5 @@
 import difflib
 from email.headerregistry import Address
 import errno
 import logging
 import os
@@ -606,7 607,7 @@ def pep621_people(people, group_name='author') -> dict:
  if 'email' in person:
  email = person['email']
  if 'name' in person:
- email = '{} <{}>'.format(person["name"], email)
  email = str(Address(person['name'], addr_spec=email))
  emails.append(email)
  elif 'name' in person:
  names.append(person['name'])

diff --git a/flit_core/flit_core/tests/samples/pep621/pyproject.toml b/flit_core/flit_core/tests/samples/pep621/pyproject.toml
@@ -5,7 5,7 @@ build-backend = "flit_core.buildapi"
 [project]
 name = "module1"
 authors = [
- {name = "Sir Robin", email = "[email protected]"}
  {name = "Sir Röbin", email = "[email protected]"}
 ]
 maintainers = [
  {name = "Sir Galahad"}

diff --git a/flit_core/flit_core/tests/test_config.py b/flit_core/flit_core/tests/test_config.py
@@ -21,7 21,7 @@ def test_load_pep621():
  assert inf.metadata['name'] == 'module1'
  assert inf.metadata['description_content_type'] == 'text/x-rst'
  assert inf.metadata['requires_dist'] == ["requests >= 2.18", "docutils"]
- assert inf.metadata['author_email'] == "Sir Robin <[email protected]>"
  assert inf.metadata['author_email'] == "Sir Röbin <[email protected]>"
  assert inf.entrypoints['flit_test_example']['foo'] == 'module1:main'
  assert set(inf.dynamic_metadata) == {'version', 'description'}