Merge lp:~milo/linaro-patchmetrics/bug1013577 into lp:linaro-patchmetrics

[Milo Casagrande]

Proposing another merge, hopefully now taking into consideration all cases.

We still have a problem with some type of "emails", that are not valid, like "dp583@stebjsxu0119.(none)": the android-review gerrit instance will skip the "(none)" part giving back an error string that does not contain the original email.

The changes should fix this, and also the tests.

[Deepti B. Kalakeri (deeptik)]

+1 Looks good.

review: Approve

=== modified file 'apps/patchmetrics/gerrit.py'
--- apps/patchmetrics/gerrit.py	2012-06-27 10:35:27 +0000
+++ apps/patchmetrics/gerrit.py	2012-06-29 08:26:22 +0000
@@ -120,9 +120,14 @@
     for key, value in query_params.iteritems():
         # We cannot have None values here, we just skip them.
         if value is not None:
+            # We need string, and remove white chars.
+            value = str(value).strip()
+            # Some emails need to be quoted, and only double quotes are
+            # accepted by gerrit.
+            if key == GERRIT_OWNER_KEY:
+                value = ("\"%s\"" % value)
             # We need strings here, and we remove white spaces.
-            params_list.append(":".join((key,
-                                        urllib.quote(str(value).strip()))))
+            params_list.append(":".join((key, urllib.quote(value))))
     # The resulting query string, without separators or prefixes, should be in
     # the form of:
     # key:value+key:value

=== modified file 'apps/patchmetrics/tests/test_gerrit.py'
--- apps/patchmetrics/tests/test_gerrit.py	2012-06-27 12:17:02 +0000
+++ apps/patchmetrics/tests/test_gerrit.py	2012-06-29 08:26:22 +0000
@@ -112,7 +112,7 @@
         query_params = {'owner': '[e-mail]', 'sortkey_after': 'abcd'}
         expected_result = (ROOT_REST_URL + CHANGES_QUERY_PATH +
                             QUERY_STRING_START + "n=100&format=JSON&q=owner:"
-                            "person%40example.org+resume_sortkey:abcd")
+                            "%22person%40example.org%22+resume_sortkey:abcd")
         self.assertEquals(expected_result,
                           create_request_query_url(ROOT_REST_URL,
                                                    CHANGES_QUERY_PATH,
@@ -125,7 +125,7 @@
                         GERRIT_QUERY_RESUME_SORTKEY: 'abcd'}
         expected_result = (ROOT_REST_URL + CHANGES_QUERY_PATH +
                             QUERY_STRING_START + "n=100&format=JSON&q=owner:"
-                            "name%2Bsurname.person%40example.org+"
+                            "%22name%2Bsurname.person%40example.org%22+"
                             "resume_sortkey:abcd")
         self.assertEquals(expected_result,
                           create_request_query_url(ROOT_REST_URL,