Merge lp:~jml/launchpad/tweak-community-contributors into lp:launchpad

[Jonathan Lange]

This branch tweaks some of the data that we use to generate https://dev.launchpad.net/Contributions.

In particular:
  * Steve Kowalik is on the Launchpad team
  * James Westby at Linaro is the same person as James Westby at Canonical (don't let the glasses fool you)
  * Didier Roche works for Canonical
  * Bryce, Dustin and Anthony Lenton all had multiple addresses

[Jonathan Lange (jml)]

Oh yeah. Pitti too :)

Also, I guess we can't land this during week 4. There's a rule that helps.

[Brad Crittenden (bac)]

Hi Jonathan, thanks for updating the lists.

I notice that Martin Pool is in both LP and not-LP lists.

Also should jpds be in the non_lp_devs list or is it ok since he always uses a canonical.com address?

pyflakes (in emacs) shows a few issues. inventory_sha1 is not used. Lots of trailing whitespace, etc.

review: Approve (code)

[Jonathan Lange (jml)]

Thanks Brad.

Whitespace & flakes fixed. Martin Pool moved to not-LP, jpds unchanged since he always uses a canonical address.

=== modified file 'utilities/community-contributions.py'
--- utilities/community-contributions.py	2010-04-09 13:53:50 +0000
+++ utilities/community-contributions.py	2010-06-25 13:21:32 +0000
@@ -162,7 +162,6 @@
                               u'Maris Fogels',
                               u'Mark Shuttleworth',
                               u'Martin Albisetti',
-                              u'Martin Pool',
                               u'Matt Zimmerman',
                               u'Matthew Paul Thomas',
                               u'Matthew Thomas',
@@ -178,6 +177,7 @@
                               u'Robert Collins',
                               u'Stuart Bishop',
                               u'Steve Alexander',
+                              u'Steve Kowalik',
                               u'Steve McInerney',
                               u'<steve {_AT_} stedee.id.au>',
                               u'test {_AT_} canonical.com',
@@ -200,13 +200,16 @@
                               u'Cody Somerville',
                               u'Cody A.W. Somerville',
                               u'David Murphy',
+                              u'Didier Roche',
                               u'Elliot Murphy',
                               u'Gabriel Neuman gneuman {_AT_} async.com',
                               u'Gustavo Niemeyer',
                               u'James Henstridge',
+                              u'James Westby',
                               u'John Lenton',
                               u'Kees Cook',
                               u'LaMont Jones',
+                              u'Martin Pitt',
                               u'Martin Pool',
                               u'Matt Zimmerman',
                               u'Michael Casadevall',
@@ -216,7 +219,7 @@
                               u'Dustin Kirkland',
                               )]
 
-# Some people have made commits using various names and/or email 
+# Some people have made commits using various names and/or email
 # addresses, so this map will be used to merge them accordingly.
 # The map is initialized from this list of pairs, where each pair is
 # of the form (CONTRIBUTOR_AS_SEEN, UNIFYING_IDENTITY_FOR_CONTRIBUTOR).
@@ -245,6 +248,18 @@
      u'Adam Conrad <adconrad {_AT_} 0c3.net>'),
     (u'Adam Conrad <adconrad {_AT_} cthulhu>',
      u'Adam Conrad <adconrad {_AT_} 0c3.net>'),
+    (u'James Westby <[e-mail]>',
+     u'James Westby <[e-mail]'),
+    (u'Bryce Harrington <[e-mail]>',
+     u'Bryce Harrington <[e-mail]>'),
+    (u'Dustin Kirkland <kirkland@x200>',
+     u'Dustin Kirkland <[e-mail]>'),
+    (u'Anthony Lenton <[e-mail]>',
+     u'Anthony Lenton <[e-mail]>'),
+    (u'Steve Kowalik <steven@quelled>',
+     u'Steve Kowalik <[e-mail]>'),
+    (u'Steve Kowalik <[e-mail]>',
+     u'Steve Kowalik <[e-mail]>'),
     )
 # Then put it in dictionary form with the correct encodings.
 merge_names_map = dict((wiki_encode(a), wiki_encode(b))
@@ -274,7 +289,6 @@
         timezone = self.top_rev.rev.timezone
         message = self.top_rev.rev.message or "(NO LOG MESSAGE)"
         rev_id = self.top_rev.rev.revision_id or "(NO REVISION ID)"
-        inventory_sha1 = self.top_rev.rev.inventory_sha1
         if timestamp:
             date_str = format_date(timestamp, timezone or 0, 'original')
         else:
@@ -325,8 +339,8 @@
             "\n",
             ]
         return ''.join(text)
-  
-  
+
+
 # "ExternalContributor" is too much to type, so I guess we'll just use this.
 class ExCon():
     """A contributor to Launchpad from outside Canonical's Launchpad team."""