-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1935 from yamagen0915/fix_getting_author_name
Add error handling for malfoemed author
- Loading branch information
Showing
2 changed files
with
25 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -163,6 +163,12 @@ def _get_author(self): # type: () -> dict | |
|
||
m = AUTHOR_REGEX.match(normalize("NFC", self._authors[0])) | ||
|
||
if m is None: | ||
raise ValueError( | ||
"Invalid author string. Must be in the format: " | ||
"John Smith <[email protected]>" | ||
) | ||
|
||
name = m.group("name") | ||
email = m.group("email") | ||
|
||
|
@@ -174,6 +180,12 @@ def _get_maintainer(self): # type: () -> dict | |
|
||
m = AUTHOR_REGEX.match(normalize("NFC", self._maintainers[0])) | ||
|
||
if m is None: | ||
raise ValueError( | ||
"Invalid maintainer string. Must be in the format: " | ||
"John Smith <[email protected]>" | ||
) | ||
|
||
name = m.group("name") | ||
email = m.group("email") | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,6 +30,19 @@ def test_package_authors(): | |
assert package.author_email is None | ||
|
||
|
||
def test_package_authors_invalid(): | ||
package = Package("foo", "0.1.0") | ||
|
||
package.authors.insert(0, "<John Doe") | ||
with pytest.raises(ValueError) as e: | ||
package.author_name | ||
|
||
assert ( | ||
str(e.value) | ||
== "Invalid author string. Must be in the format: John Smith <[email protected]>" | ||
) | ||
|
||
|
||
@pytest.mark.parametrize("category", ["main", "dev"]) | ||
def test_package_add_dependency_vcs_category(category): | ||
package = Package("foo", "0.1.0") | ||
|