From: Sam Vilain Date: Thu, 09 Mar 2006 05:29:58 GMT Subject: [stgit] [PATCH] common: parse 'email (name)' correctly Message-ID: <440FBD56.1040007@vilain.net> Currently only e-mails of the form "Name " are accepted by stgit import etc, however some people use "email (Name)". Accept this alternate form. --- Note: the function just below it might need consideration, too. stgit/commands/common.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stgit/commands/common.py b/stgit/commands/common.py index 2985379..4bfa4dd 100644 --- a/stgit/commands/common.py +++ b/stgit/commands/common.py @@ -175,12 +175,15 @@ def push_patches(patches, check_merged = def name_email(address): """Return a tuple consisting of the name and email parsed from a - standard 'name ' string + standard 'name ' or 'email (name)' string """ address = re.sub('[\\\\"]', '\\\\\g<0>', address) str_list = re.findall('^(.*)\s*<(.*)>\s*$', address) if not str_list: - raise CmdException, 'Incorrect "name " string: %s' % address + str_list = re.findall('^(.*)\s*\((.*)\)\s*$', address) + if not str_list: + raise CmdException, 'Incorrect "name "/"email (name)" string: %s' % address + return ( str_list[0][1], str_list[0][0] ) return str_list[0]