From 3a425de23e73434016ca0e4e50f84e1621027fa7 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 27 Apr 2016 13:05:54 +0300 Subject: [PATCH] grep-merges: Do not override author or uploader with None There can be JSON entries which have uploader=None, and such entries would lead to TypeError when trying to use ' '.join(). --- grep-merges | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grep-merges b/grep-merges index d9cfb3a..c180d92 100755 --- a/grep-merges +++ b/grep-merges @@ -61,9 +61,9 @@ def main(): 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