From 3052bfcc165f4983661092c855b181389b334b43 Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@ubuntu.com>
Date: Wed, 4 Sep 2019 13:28:20 -0300
Subject: [PATCH] Port grep-merges to python 3

---
 grep-merges | 20 ++++++++------------
 setup.py    |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/grep-merges b/grep-merges
index 3206920..3658a1b 100755
--- a/grep-merges
+++ b/grep-merges
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 #
 # grep-merges - search for pending merges from Debian
 #
@@ -51,12 +51,12 @@ def main():
         url = 'https://merges.ubuntu.com/%s.json' % component
         try:
             headers, page = Http().request(url)
-        except HttpLib2Error, e:
-            print >> sys.stderr, str(e)
+        except HttpLib2Error as e:
+            print(str(e), file=sys.stderr)
             sys.exit(1)
         if headers.status != 200:
-            print >> sys.stderr, "%s: %s %s" % (url, headers.status,
-                                                headers.reason)
+            print("%s: %s %s" % (url, headers.status, headers.reason),
+                  file=sys.stderr)
             sys.exit(1)
 
         for merge in json.loads(page):
@@ -66,16 +66,12 @@ def main():
                 author = merge['user']
             if merge.get('uploader'):
                 uploader = '(%s)' % merge['uploader']
-            try:
-                teams = merge['teams']
-            except e:
-                teams = []
+            teams = merge.get('teams', [])
 
-            pretty_uploader = u'{} {}'.format(author, uploader)
+            pretty_uploader = '{} {}'.format(author, uploader)
             if (match is None or match in package or match in author
                or match in uploader or match in teams):
-                print '%s\t%s' % (package.encode("utf-8"),
-                                  pretty_uploader.encode("utf-8"))
+                print('%s\t%s' % (package, pretty_uploader))
 
 
 if __name__ == '__main__':
diff --git a/setup.py b/setup.py
index 85d7efd..b0688f7 100755
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@ if sys.version_info[0] >= 3:
         'check-symbols',
         'dch-repeat',
         'grab-merge',
+        'grep-merges',
         'mk-sbuild',
         'pbuilder-dist-simple',
         'pull-debian-source',
@@ -38,7 +39,6 @@ if sys.version_info[0] >= 3:
     ]
 else:
     scripts = [
-        'grep-merges',
         'hugdaylist',
         'import-bug-from-debian',
         'merge-changelog',