Skip to content

Normalize author name unicode before matching #2006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdispater merged 3 commits into from
Feb 28, 2020
Merged

Normalize author name unicode before matching #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abf557b
Fix accented characters not being matched in author name
raphaelyancey Feb 8, 2020
14da165
Normalized the strings instead of modifying the pattern
raphaelyancey Feb 9, 2020
236efbe
Applied isort & black
raphaelyancey Feb 11, 2020
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: 3 additions & 2 deletions poetry/packages/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from contextlib import contextmanager
from typing import Union
from unicodedata import normalize
from warnings import warn

from poetry.semver import Version
Expand Down Expand Up @@ -160,7 +161,7 @@ def _get_author(self): # type: () -> dict
if not self._authors:
return {"name": None, "email": None}

m = AUTHOR_REGEX.match(self._authors[0])
m = AUTHOR_REGEX.match(normalize("NFC", self._authors[0]))

name = m.group("name")
email = m.group("email")
Expand All @@ -171,7 +172,7 @@ def _get_maintainer(self): # type: () -> dict
if not self._maintainers:
return {"name": None, "email": None}

m = AUTHOR_REGEX.match(self._maintainers[0])
m = AUTHOR_REGEX.match(normalize("NFC", self._maintainers[0]))

name = m.group("name")
email = m.group("email")
Expand Down
12 changes: 12 additions & 0 deletions tests/packages/test_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ def test_package_authors():
assert package.author_name == "Sébastien Eustace"
assert package.author_email == "sebastien@eustace.io"

package.authors.insert(
0, "Raphaël Yancey <raphael@badfile.net>"
) # With combining diacritics (ë = e + ¨ = e\u0308)
assert package.author_name == "Raphaël Yancey" # Is normalized into \u00EB
assert package.author_email == "raphael@badfile.net"

package.authors.insert(
0, "Raphaël Yancey <raphael@badfile.net>"
) # Without (ë = \u00EB)
assert package.author_name == "Raphaël Yancey"
assert package.author_email == "raphael@badfile.net"

package.authors.insert(0, "John Doe")
assert package.author_name == "John Doe"
assert package.author_email is None
Expand Down