@@ -111,13 +111,13 @@ def find_author(mail):
# for "Firstname Lastname" <example@example.com> style addresses
(re.compile(r'"?(.*?)"?\s*<([^>]+)>'), (lambda g: (g[0], g[1]))),
- # for example@example.com (Firstname Lastname) style addresses
- (re.compile(r'"?(.*?)"?\s*\(([^\)]+)\)'), (lambda g: (g[1], g[0]))),
-
# for example at example.com (Firstname Lastname) style addresses
(re.compile(r'(.*?)\sat\s(.*?)\s*\(([^\)]+)\)'),
(lambda g: (g[2], '@'.join(g[0:2])))),
+ # for example@example.com (Firstname Lastname) style addresses
+ (re.compile(r'"?(.*?)"?\s*\(([^\)]+)\)'), (lambda g: (g[1], g[0]))),
+
# everything else
(re.compile(r'(.*)'), (lambda g: (None, g[0]))),
]
@@ -38,7 +38,6 @@ from patchwork.parser import find_pull_request
from patchwork.parser import parse_mail as _parse_mail
from patchwork.parser import parse_series_marker
from patchwork.parser import split_prefixes
-from patchwork.tests.utils import create_email
from patchwork.tests.utils import create_project
from patchwork.tests.utils import create_state
from patchwork.tests.utils import create_user
Multiple different 'From:' header styles are supported by the parser, but some of these are less specific than others. Attempt to parse using a more specific style before going with the more generic one. Signed-off-by: Stephen Finucane <stephen.finucane@intel.com> --- patchwork/parser.py | 6 +++--- patchwork/tests/test_parser.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)