Merge branch 'master' into pylons0.10

* master:
  use unquoted email address for MIA lookup
  mark all patterns that require optional information as optional
  update keyringanalyzer.py copyright information
  use email address for MIA pattern to catch non-DDs
  add support for automatic DM data lookup
  silence keyringanalyzer
  fix path handling in keyringanalyzer
  add flattr button
  add flattr button

ddportfolioservice/controllers/ddportfolio.py

@@ -149,12 +149,19 @@ developer name on all bug logs)'),
             return render('/showform.mako')
         fields = dddatabuilder.build_data(form_result['email'])
         rp = request.params.copy()
-        if fields['isdd']:
-            for tuple in (('name', 'name'),
-                          ('gpgfp', 'gpgfp'),
-                          ('username', 'username'),
-                          ('aliothusername', 'username'),
-                          ('nonddemail', 'email')):
+
+        DM_TUPLES = (('name', 'name'),
+                     ('gpgfp', 'gpgfp'),
+                     ('nonddemail', 'email'))
+        DD_TUPLES = (('username', 'username'),
+                     ('aliothusername', 'username'))
+
+        if fields['type'] in (dddatabuilder.TYPE_DD, dddatabuilder.TYPE_DM):
+            for tuple in DM_TUPLES:
+                if not tuple[0] in rp or not rp[tuple[0]]:
+                    rp[tuple[0]] = fields[tuple[1]]
+        if fields['type'] == dddatabuilder.TYPE_DD:
+            for tuple in DD_TUPLES:
                 if not tuple[0] in rp or not rp[tuple[0]]:
                     rp[tuple[0]] = fields[tuple[1]]