summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2009-07-24 13:56:21 -0600
committerJonathan Corbet <corbet@lwn.net>2009-07-24 13:56:21 -0600
commitd25572552b2ac5cf906555674ad9ed95c3acb41e (patch)
treebe01c2ab64978257a380a183ddb4e48fd8697d6b
parentc0d9831515530f29875a56df997657f62a505577 (diff)
Reduce the number of "funky email" gripes
Addresses of the form "user at host.wherever" can be trivially repaired, so let's do so. A couple of other minor tweaks are included here as well; nothing which changes behavior.
-rw-r--r--database.py3
-rwxr-xr-xgitdm4
-rw-r--r--patterns.py2
3 files changed, 5 insertions, 4 deletions
diff --git a/database.py b/database.py
index dbada8a..f15cc7a 100644
--- a/database.py
+++ b/database.py
@@ -192,7 +192,8 @@ def AddEmailEmployerMapping (email, employer, end = nextyear):
EmailToEmployer[email] = [(end, empl)]
def MapToEmployer (email, unknown = 0):
- email = email.lower ()
+ # Somebody sometimes does s/@/ at /; let's fix it.
+ email = email.lower ().replace (' at ', '@')
try:
return EmailToEmployer[email]
except KeyError:
diff --git a/gitdm b/gitdm
index 04536e4..d109cc2 100755
--- a/gitdm
+++ b/gitdm
@@ -4,8 +4,8 @@
#
# This code is part of the LWN git data miner.
#
-# Copyright 2007-8 LWN.net
-# Copyright 2007-8 Jonathan Corbet <corbet@lwn.net>
+# Copyright 2007-9 LWN.net
+# Copyright 2007-9 Jonathan Corbet <corbet@lwn.net>
#
# This file may be distributed under the terms of the GNU General
# Public License, version 2.
diff --git a/patterns.py b/patterns.py
index ca34586..f912d9a 100644
--- a/patterns.py
+++ b/patterns.py
@@ -21,7 +21,7 @@ Pcommit = re.compile (r'^commit ([0-9a-f ]+)$')
Pauthor = re.compile (r'^Author:' + Pemail + '$')
Psob = re.compile (r'Signed-off-by:' + Pemail)
Pmerge = re.compile (r'^Merge:.*$')
-Padd = re.compile (r'^\+[^\+].*$')
+Padd = re.compile (r'^\+[^+].*$')
Prem = re.compile (r'^-[^-].*$')
Pdate = re.compile (r'^(Commit)?Date:\s+(.*)$')
Pfilea = re.compile (r'^---\s+(.*)$')