Skip to content

Commit f2eb0f3

Browse files
Fix parsing maintainers with unmatched email brackets
Fixes #5402 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent e423b48 commit f2eb0f3

2 files changed

Lines changed: 22 additions & 4 deletions

File tree

‎src/packagedcode/utils.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,10 @@ def parse_maintainer_name_email(maintainer):
217217
Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
218218
"""
219219
email_wrappers = ["<", ">"]
220-
has_email = "@" in maintainer and all([
221-
True
220+
has_email = "@" in maintainer and all(
221+
char in maintainer
222222
for char in email_wrappers
223-
if char in maintainer
224-
])
223+
)
225224
if not has_email:
226225
return maintainer, None
227226

‎tests/packagedcode/test_utils.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,29 @@
1010
from unittest import TestCase
1111

1212
from packagedcode.utils import normalize_vcs_url
13+
from packagedcode.utils import parse_maintainer_name_email
1314

1415

1516
class TestPackageUtils(TestCase):
1617

18+
def test_parse_maintainer_name_email(self):
19+
maintainer = 'Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>'
20+
expected = (
21+
'Debian systemd Maintainers',
22+
'pkg-systemd-maintainers@lists.alioth.debian.org',
23+
)
24+
assert parse_maintainer_name_email(maintainer) == expected
25+
26+
def test_parse_maintainer_name_email_without_angle_brackets(self):
27+
maintainer = 'John Doe john@example.com'
28+
expected = ('John Doe john@example.com', None)
29+
assert parse_maintainer_name_email(maintainer) == expected
30+
31+
def test_parse_maintainer_name_email_with_unmatched_angle_bracket(self):
32+
maintainer = 'John Doe <john@example.com'
33+
expected = ('John Doe <john@example.com', None)
34+
assert parse_maintainer_name_email(maintainer) == expected
35+
1736
def test_normalize_vcs_url_basic(self):
1837
url = 'https://pear2.php.net'
1938
result = normalize_vcs_url(url)

0 commit comments

Comments
 (0)