From 1773f0b17ad6ebbcdb16c56bc8c70545e14d7420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionu=C8=9B=20Ar=C8=9B=C4=83ri=C8=99i?= Date: Wed, 16 Jan 2013 15:06:00 +0100 Subject: use regexp to parse the mailmap this also makes parse_mailmap() work with the swift .mailmap and should be more readable Change-Id: I3abb2a18d655e507bee5f621ebc64421d943cf0b --- setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 315ea87..d83f3f6 100644 --- a/setup.py +++ b/setup.py @@ -34,11 +34,12 @@ def parse_mailmap(mailmap='.mailmap'): if os.path.exists(mailmap): with open(mailmap, 'r') as fp: for l in fp: - l = l.strip() - if not l.startswith('#') and ' ' in l: - canonical_email, alias = [x for x in l.split(' ') - if x.startswith('<')] - mapping[alias] = canonical_email + try: + canonical_email, alias = re.match( + r'[^#]*?(<.+>).*(<.+>).*', l).groups() + except AttributeError: + continue + mapping[alias] = canonical_email return mapping -- cgit v1.2.1