Merge lp:~mitya57/ubuntu-dev-tools/grep-merges-fix into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

[Dmitry Shachnev]

This line:

{u'uploaded': u'outstanding', u'source_package': u'xfce4-whiskermenu-plugin', u'age': 25, u'right_version': u'1.5.2-1', u'link': u'https://merges.ubuntu.com/x/xfce4-whiskermenu-plugin/', u'user': None, u'uploader': None, u'short_description': u'merge 1.5.2-1', u'base_version': u'1.5.1-1', u'binaries': [u'xfce4-whiskermenu-plugin'], u'left_version': u'1.5.1-1ubuntu1'}

can lead to the following error:

Traceback (most recent call last):
  File "/usr/bin/grep-merges", line 74, in <module>
    main()
  File "/usr/bin/grep-merges", line 68, in main
    pretty_uploader = ' '.join((author, uploader)).strip()
TypeError: sequence item 0: expected string, NoneType found

This merge proposal fixes that issue.

[Martin Pitt (pitti)]

Looks good in general, I just have a style/simplification/robustification nitpick. Thanks!

review: Approve

=== modified file 'grep-merges'
--- grep-merges	2012-05-06 03:24:14 +0000
+++ grep-merges	2016-04-27 10:09:33 +0000
@@ -61,9 +61,9 @@
         for merge in json.loads(page):
             package = merge['source_package']
             author, uploader = '', ''
-            if 'user' in merge:
+            if 'user' in merge and merge['user'] is not None:
                 author = merge['user']
-            if 'uploader' in merge:
+            if 'uploader' in merge and merge['uploader'] is not None:
                 uploader = '(%s)' % merge['uploader']
             pretty_uploader = ' '.join((author, uploader)).strip()
             if (match is None or