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.

diff --git a/database.py b/database.py
index dbada8ac0395dbbca8374db2eb55fa286ebeb520..f15cc7a802e8ef3f17c47049744d678350c327ba 100644 (file)
--- 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 04536e43d9b9d1a168f283daa315da06fe20c9bd..d109cc23c17a78fe77e18b8f4c35ea2d5a410cd8 100755 (executable)
--- 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 ca34586485b2cb50becfad3b43b7d2257e9fdb4e..f912d9a6b4a81a4ce1d65fc924878bafd24c4179 100644 (file)
--- 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+(.*)$')