Merge lp:~jelmer/hydrazine/trunk into lp:hydrazine

[Jelmer Vernooij]

Initial work on a port to Python 3.

Initial work on port to Python 3.

I haven't tested all tools in depth yet, but this is sufficient to at least
be able to run each one of them without syntax errors and to make
brz's bug checking script happy.

[Martin Pool (mbp)]

Hi, sorry for the long delay.

This look fine, thanks for proposing it. I think you are now a co-admin, so feel free to ask me for reviews but also feel free to merge without it.

review: Approve

=== modified file 'README'
--- README	2013-03-23 23:14:17 +0000
+++ README	2021-05-03 12:32:54 +0000
@@ -6,8 +6,8 @@
 
 It depends on:
 
- * launchpadlib
- * bzrlib (in the bzr package)
+ * launchpadlib (in the python3-launchpadlib package)
+ * breezy (in the python3-breezy package)
 
 It's rough but useful.  Bugs and merge requests welcome through
 <https://launchpad.net/hydrazine/>.

=== modified file 'bugclient'
--- bugclient	2013-03-23 22:49:55 +0000
+++ bugclient	2021-05-03 12:32:54 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 
 # Copyright (C) 2010 Martin Pool
 
@@ -34,7 +34,7 @@
         return self.enums
 
     def show_valid(self):
-        print "Sorry, valid entries are:"
+        print("Sorry, valid entries are:")
         _show_columnated(self.enums)
 
 status_enum = NamedEnum(['Confirmed', 'Triaged', 'Fix Committed',
@@ -75,7 +75,7 @@
         if self._needs_pillar(): return
         kwargs = {}
         if not self.filters:
-            print 'No filter set?'
+            print('No filter set?')
             return
         for f in self.filters:
             if f == "milestone":
@@ -94,7 +94,7 @@
         kwargs['order_by'] = '-datecreated'
         self.task_list = self.pillar.searchTasks(**kwargs)
 
-        if 'regexp' in self.filters.keys():
+        if 'regexp' in list(self.filters.keys()):
             new_task_list = []
             for t in self.task_list:
                 # FIXME: can be expanded to search descriptions, if needed
@@ -107,12 +107,12 @@
             self.search_index = 0
             self._select_bug(first_bug_task.bug, "quiet")
         except IndexError:
-            print "No bugtasks found"
+            print("No bugtasks found")
             return
 
         args = line.split()
         if not args:
-            print "Task list loaded"
+            print("Task list loaded")
             self._show_bug(self.bug)
             return
 
@@ -131,12 +131,12 @@
         try:
             bug_number = int(bug_number)
         except ValueError:
-            print 'usage: bzr NUMBER'
+            print('usage: bzr NUMBER')
             return
         try:
             the_bug = self.session.bugs[bug_number]
         except KeyError:
-            print 'no such bug?'
+            print('no such bug?')
             return
         self._select_bug(the_bug)
 
@@ -144,16 +144,16 @@
         """Post a comment to the current bug."""
         if self._needs_bug(): return
         if not line:
-            print "Please specify a comment"
+            print("Please specify a comment")
             return
         result = self.bug.newMessage(content=line)
-        print "Posted message: %s" % result
+        print(("Posted message: %s" % result))
 
     def do_description(self, nothing):
         """Show bug description"""
         if self._needs_bug():
             return
-        print self.bug.description
+        print((self.bug.description))
 
     def do_duplicate(self, duplicate_id):
         """Mark as a duplicate"""
@@ -162,18 +162,18 @@
         try:
             duplicate_id = int(duplicate_id)
         except ValueError:
-            print 'usage: duplicate BUG_NUMBER'
+            print('usage: duplicate BUG_NUMBER')
             return
         # XXX: could just synthesize a URL, which might be faster; probably
         # need to make sure the root lines up correctly
         try:
             duplicate_bug = self.session.bugs[duplicate_id]
         except KeyError:
-            print 'no such bug?'
+            print('no such bug?')
             return
-        print 'marking %d as a duplicate of %d' % (self.current_bug_number,
-            duplicate_bug.id)
-        print '    "%s"' % duplicate_bug.title
+        print(('marking %d as a duplicate of %d' % (self.current_bug_number,
+            duplicate_bug.id)))
+        print(('    "%s"' % duplicate_bug.title))
         # used to use markAsDuplicate but see bug 680339
         self.bug.duplicate_of = duplicate_bug
         self.bug.lp_save()
@@ -216,8 +216,8 @@
         elif args[0] == "regexp":
             try:
                 re.compile(' '.join(args[1:]))
-            except re.error, e:
-                print "regexp error: %s" % e
+            except re.error as e:
+                print(("regexp error: %s" % e))
                 return
         elif args[0] == "tags_combinator":
             val = tags_combinator_enum.get(' '.join(args[1:]))
@@ -237,17 +237,17 @@
         if new_importance is None:
             importance_enum.show_valid()
             return
-        print '#%d changing importance %s => %s' % (self.bug.id, task.importance, new_importance)
+        print(('#%d changing importance %s => %s' % (self.bug.id, task.importance, new_importance)))
         task.importance = new_importance
         if opts.debug:
-            print '**** before save'
-            print task._wadl_resource._definition.representation
+            print('**** before save')
+            print((task._wadl_resource._definition.representation))
         try:
             task.lp_save()
         except:
-            print '**** got error'
+            print('**** got error')
             if opts.debug:
-                print task._wadl_resource._definition.representation
+                print((task._wadl_resource._definition.representation))
 
     def do_milestone(self, line):
         """Set milestone"""
@@ -256,7 +256,7 @@
         if task is None:
             return
         if not line:
-            print 'No milestone specified?'
+            print('No milestone specified?')
             return
 
         milestone = '%s/+milestone/%s' % (self.pillar, line)
@@ -266,13 +266,13 @@
     def do_next(self, show):
         """Go to the next bug in the list"""
         if self.task_list is None:
-            print 'no list loaded; use a filter and batch to load a list'
+            print('no list loaded; use a filter and batch to load a list')
             return
         self.search_index += 1
         try:
             bug_task = self.task_list[self.search_index]
         except IndexError:
-            print "End of bug list"
+            print("End of bug list")
             return
         if show == "":
             show = "show"
@@ -283,9 +283,9 @@
         if self._needs_pillar(): return
         tags = self.pillar.official_bug_tags
         if not tags:
-            print 'No official bug tags for %s' % self.pillar.name
+            print('No official bug tags for %s' % self.pillar.name)
             return
-        print 'Official bug tags for %s' % self.pillar.name
+        print('Official bug tags for %s' % self.pillar.name)
         _show_columnated(tags)
 
     def do_open(self, ignored):
@@ -309,15 +309,15 @@
         task = self._needs_single_task()
         if task is None: return
         if not to_pillar:
-            print 'usage: retarget TO_PILLAR'
+            print('usage: retarget TO_PILLAR')
             return
         new_target = self._find_pillar(to_pillar)
         if new_target is None:
-            print 'no such product?'
+            print('no such product?')
             return
-        print 'change target of bug %s' % (task.bug.id,)
-        print '  from: %s' % (task.target,)
-        print '    to: %s' % (new_target,)
+        print('change target of bug %s' % (task.bug.id,))
+        print('  from: %s' % (task.target,))
+        print('    to: %s' % (new_target,))
         task.target = new_target
         task.lp_save()
 
@@ -338,8 +338,8 @@
         """
         if self._needs_bug():
             return
-        print 'changing title of bug %d to "%s"' % (self.bug.id, new_title)
-        print '  old title "%s"' % (self.bug.title)
+        print('changing title of bug %d to "%s"' % (self.bug.id, new_title))
+        print('  old title "%s"' % (self.bug.title))
         self.bug.title = new_title
         self.bug.lp_save()
 
@@ -355,7 +355,7 @@
         if new_status is None:
             status_enum.show_valid()
             return
-        print '#%d changing status %s => %s' % (self.bug.id, task.status, new_status)
+        print('#%d changing status %s => %s' % (self.bug.id, task.status, new_status))
         task.status = new_status
         task.lp_save()
 
@@ -371,7 +371,7 @@
 """
         if self._needs_bug(): return
         if not line.strip():
-            print 'bug %d tags: %s' % (self.bug.id, ' '.join(self.bug.tags))
+            print('bug %d tags: %s' % (self.bug.id, ' '.join(self.bug.tags)))
             return
         to_add = []
         to_remove = []
@@ -391,9 +391,9 @@
         for a in to_remove:
             if a in new_tags:
                 new_tags.remove(a)
-        print 'changing bug %d tags' % self.bug.id
-        print '  from: %s' % ' '.join(old_tags)
-        print '    to: %s' % ' '.join(new_tags)
+        print('changing bug %d tags' % self.bug.id)
+        print('  from: %s' % ' '.join(old_tags))
+        print('    to: %s' % ' '.join(new_tags))
         self.bug.tags = new_tags
         self.bug.lp_save()
 
@@ -406,7 +406,7 @@
         if self._needs_bug(): return
         task = self._needs_single_task()
         if not task:
-            print 'no task selected'
+            print('no task selected')
             return
         for w in line.split():
             if w[0] == '+':
@@ -432,24 +432,24 @@
             # can't use super because Cmd is an old-style
             # class
             return cmd.Cmd.onecmd(self, cmdline)
-        except lazr.restfulclient.errors.RestfulError, e:
-            print e
+        except lazr.restfulclient.errors.RestfulError as e:
+            print(e)
             pass
 
     def _needs_bug(self):
         if self.bug is None:
-            print 'no bug selected'
+            print('no bug selected')
             return True
 
     def _needs_pillar(self):
         if self.pillar is None:
-            print 'no pillar selected'
+            print('no pillar selected')
             return True
 
     def _needs_single_task(self):
         """Return the single task for the current bug in the current pillar, or None"""
         if self.bug is None:
-            print 'no bug selected'
+            print('no bug selected')
             return None
         tasks = list(self.bug.bug_tasks)
         if self.pillar is None:
@@ -457,14 +457,14 @@
                 # no pillar; assume this is ok
                 return tasks[0]
             else:
-                print 'This bug has multiple tasks; please choose a pillar'
+                print('This bug has multiple tasks; please choose a pillar')
                 return None
         else:
             for t in tasks:
                 if t.target.self_link == self.pillar.self_link:
                     return t
             else:
-                print 'No task for %s in %s' % (self.pillar, self.bug)
+                print('No task for %s in %s' % (self.pillar, self.bug))
                 return None
 
     @property
@@ -495,43 +495,43 @@
         try:
             return pillar_collection[0]
         except IndexError:
-            print "No such pillar?"
+            print("No such pillar?")
             return
 
     def _select_pillar(self, pillar):
         self.pillar = pillar
         if pillar is None:
-            print "no pillar selected"
+            print("no pillar selected")
         else:
-            print "  %s" % self.pillar
+            print("  %s" % self.pillar)
 
     def _show_bug(self, bug):
-        print 'bug: %d: %s' % (bug.id, bug.title)
+        print('bug: %d: %s' % (bug.id, bug.title))
         if bug.duplicate_of:
-            print '  duplicate of bug %d' % (bug.duplicate_of.id,)
+            print('  duplicate of bug %d' % (bug.duplicate_of.id,))
         else:
             for task in bug.bug_tasks:
-                print '  affects %-40s %14s %s' % (
-                    task.bug_target_name, task.status, task.importance,)
+                print('  affects %-40s %14s %s' % (
+                    task.bug_target_name, task.status, task.importance,))
                 if task.milestone:
-                    print '  milestone: %s' % task.milestone.name
-            print '  tags: %s' % ' '.join(bug.tags)
+                    print('  milestone: %s' % task.milestone.name)
+            print('  tags: %s' % ' '.join(bug.tags))
 
 def _show_columnated(tags):
     tags = tags[:]
-    longest = max(map(len, tags))
+    longest = max(list(map(len, tags)))
     cols = int(os.environ.get('COLUMNS', '80'))
     per_row = max(int((cols-1)/(longest + 1)), 1)
     i = 0
     while tags:
         t = tags.pop(0)
-        print '%-*s' % (longest, t),
+        print('%-*s' % (longest, t), end=' ')
         i += 1
         if i == per_row:
-            print
+            print()
             i = 0
     if i != 0:
-        print
+        print()
 
 
 def main(argv):
@@ -564,7 +564,7 @@
     cmd._connect()
 
     for c in opts.commands or []:
-        print '> ' + c
+        print('> ' + c)
         if cmd.onecmd(c):
             break
     else:

=== modified file 'capture-bug-counts'
--- capture-bug-counts	2013-03-23 22:49:55 +0000
+++ capture-bug-counts	2021-05-03 12:32:54 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 
 import sys
 
@@ -70,10 +70,10 @@
     def show_text(self):
         # print self.get_name()
         for category in self.query_categories():
-            print '%6d %s %s' % (category.count_bugs(),
+            print('%6d %s %s' % (category.count_bugs(),
                 category.get_name(),
-                category.get_link_url() or '')
-        print
+                category.get_link_url() or ''))
+        print()
 
 
 class PatchCannedQuery(CannedQuery):
@@ -103,7 +103,7 @@
             if bugtask.status not in by_status:
                 by_status[bugtask.status] = StatusBugCategory(bugtask.status)
             by_status[bugtask.status].add(bugtask)
-        return by_status.values()
+        return list(by_status.values())
 
 
 def show_bug_report(project):

=== modified file 'check-membership'
--- check-membership	2010-12-02 00:02:43 +0000
+++ check-membership	2021-05-03 12:32:54 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 #
 # Copyright (C) 2009 Canonical Ltd 
 
@@ -17,7 +17,7 @@
 
 def main(argv):
     if len(argv) != 3:
-        print __doc__
+        print(__doc__)
         return 2
     user_name = argv[1]
     group_name = argv[2]
@@ -25,10 +25,10 @@
     user = launchpad.people[user_name]
     for user_team in user.super_teams:
         if user_team.name == group_name:
-            print '%s is a member of %s' % (user_name, group_name)
+            print('%s is a member of %s' % (user_name, group_name))
             return 0
     else:
-        print '%s is not a member of %s' % (user_name, group_name)
+        print('%s is not a member of %s' % (user_name, group_name))
         return 1
 
 

=== modified file 'feed-pqm'
--- feed-pqm	2011-12-21 11:25:36 +0000
+++ feed-pqm	2021-05-03 12:32:54 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 # vi: expandtab:sts=4
 
 # Copyright (C) 2010 Martin Pool
@@ -19,29 +19,21 @@
 import optparse
 import sys
 
-try:
-    from bzrlib import initialize as bzrlib_initialize
-except ImportError:
-    import bzrlib.ui
-    def bzrlib_setup():
-        """Setup bzrlib ui for older bzr versions without bzrlib.initialize"""
-        bzrlib.ui.ui_factory = bzrlib.ui.make_ui_for_terminal(
-            sys.stdin, sys.stdout, sys.stderr)
-else:
-    import atexit
-    def bzrlib_setup():
-        """Call bzrlib.initialize and register cleanup to be run on exit"""
-        context = bzrlib_initialize()
-        if context is not None:
-            atexit.register(context.__enter__().__exit__, None, None, None)
+from breezy import initialize as breezy_initialize
+import atexit
+def breezy_setup():
+    """Call breezy.initialize and register cleanup to be run on exit"""
+    context = breezy_initialize()
+    if context is not None:
+        atexit.register(context.__enter__().__exit__, None, None, None)
 
-from bzrlib.email_message import EmailMessage
-from bzrlib import (
+from breezy.email_message import EmailMessage
+from breezy import (
     config as _mod_config,
     gpg,
-    version_info as bzrlib_version,
+    version_info as breezy_version,
     )
-from bzrlib.smtp_connection import SMTPConnection
+from breezy.smtp_connection import SMTPConnection
 
 import hydrazine
 
@@ -51,12 +43,12 @@
 
 
 def read_choice():
-    print 'What now?',
+    print('What now?', end='')
     return raw_input()
 
 
 def show_help():
-    print """\
+    print("""\
 feed-pqm looks for approved merge proposals and sends them to pqm.
 
 commands:
@@ -69,7 +61,7 @@
             appropriately in bazaar.conf, and your key in the PQM keyring.
 
 Please send feedback to [e-mail]
-"""
+""")
 
     #does not currently do anything useful
     """\
@@ -80,48 +72,48 @@
 """
 
 def show_datetime(label, dt):
-    print "  %12s: %s"  % (label, dt) 
+    print("  %12s: %s"  % (label, dt) )
         # TODO: show relative time
         #  (datetime.datetime.utcnow() - dt).days)
 
 
 def show_mp(mp):
-    print mp.web_link
+    print(mp.web_link)
     # nb: .url is empty (except on mirrored branches?)
-    print '  %12s: %s' % ('message', mp.commit_message)
-    print '  %12s: %s' % ('source', mp.source_branch.bzr_identity)
-    print '  %12s: %s' % ('target', mp.target_branch.bzr_identity)
+    print('  %12s: %s' % ('message', mp.commit_message))
+    print('  %12s: %s' % ('source', mp.source_branch.bzr_identity))
+    print('  %12s: %s' % ('target', mp.target_branch.bzr_identity))
     prereq_branch = mp.prerequisite_branch
     if prereq_branch is not None:
-        print '  %12s: %s' % ('prereq', prereq_branch.bzr_identity)
-    print '  %12s: %s' % ('status', mp.queue_status)
+        print('  %12s: %s' % ('prereq', prereq_branch.bzr_identity))
+    print('  %12s: %s' % ('status', mp.queue_status))
     show_datetime('created', mp.date_created)
     show_datetime('reviewed', mp.date_reviewed)
-    print '  %12s: %s' % ('registrant', mp.registrant.name)
+    print('  %12s: %s' % ('registrant', mp.registrant.name))
     for vote in mp.votes_collection:
         # XXX: would like to show the date but see bug 530475
-        print "  %12s: %30s %-12s" % ('vote', vote.reviewer.name, 
+        print("  %12s: %30s %-12s" % ('vote', vote.reviewer.name, 
             (vote.comment and vote.comment.vote or 'Requested'),
-            )
+            ))
     # The last comment is usually enough to get a sense for things. Change if
     # desired.
-    print "Recent comments:"
+    print("Recent comments:")
     comments = list(mp.all_comments) #XXX: See bug lp:583761
     for comment in comments[-1:]:
         val = "%s: %s" % (comment.author.name, comment.message_body)
         try:
-            print val
+            print(val)
         except UnicodeError:
             val = val.encode('ascii', 'replace')
-            print val
+            print(val)
 
 
 def set_message(mp):
-    print "old commit message: %s" % (mp.commit_message,)
-    print "new message> ",
+    print("old commit message: %s" % (mp.commit_message,))
+    print("new message> ", end='')
     message = raw_input()
     if len(message) < 2:
-        print "Too short to be a commit message?"
+        print("Too short to be a commit message?")
         return
     mp.commit_message = message
     mp.lp_save()
@@ -129,7 +121,7 @@
 
 def queue_mp(launchpad, mp):
     if not mp.commit_message:
-        print "No message set?  Use 'm'."
+        print("No message set?  Use 'm'.")
         return
     if mp.queue_status == 'Queued':
         mp.setStatus(status='Approved')
@@ -138,22 +130,18 @@
 
 def send_mp(launchpad, mp, send_mail=True):
     if not mp.commit_message:
-        print "No message set - %s queued badly? Set a message first." % mp
+        print("No message set - %s queued badly? Set a message first." % mp)
         return False
-    print "merge command to be signed:"
+    print("merge command to be signed:")
     raw_message = (
         "star-merge %s %s\n"
         % (mp.source_branch.composePublicURL(scheme='http'),
             mp.target_branch.composePublicURL(scheme='http')))
-    print raw_message
+    print(raw_message)
 
-    if bzrlib_version < (2, 5):
-        config = _mod_config.GlobalConfig()
-        my_email = config.user_email()
-    else:
-        config = _mod_config.GlobalStack()
-        my_email = config.get('email')
-    print "Will send email from address <%s>" % (my_email,)
+    config = _mod_config.GlobalStack()
+    my_email = config.get('email')
+    print("Will send email from address <%s>" % (my_email,))
     signer = gpg.GPGStrategy(config)
     signed_message = signer.sign(raw_message.encode('utf8'))
     # TODO: put in bug numbers as well.
@@ -163,16 +151,16 @@
                            signed_message)
     if send_mail:
         SMTPConnection(config).send_email(message)
-        print "Sent!"
+        print("Sent!")
     else:
-        print "Not sending email - disabled."
+        print("Not sending email - disabled.")
 
     # suggested subject should match the last comment on the mp so that gmail
     # doesn't see it as a separate thread;
     # <https://bugs.edge.launchpad.net/hydrazine/+bug/541586>
     subject = "Re: [Merge] %s into %s" % (mp.source_branch.bzr_identity,
         mp.target_branch.bzr_identity)
-    print "Recording that the proposal is submitted to PQM."
+    print("Recording that the proposal is submitted to PQM.")
     fed_pqm = "sent to pqm by email\n"
     mp.createComment(content=fed_pqm, subject=subject)
     return True
@@ -191,7 +179,7 @@
     find_status = ['Approved']
     if include_queued:
         find_status.append('Queued')
-    print 'Looking for %r mps in %s' % (find_status, project)
+    print('Looking for %r mps in %s' % (find_status, project))
     for mp in project.getMergeProposals(status=find_status):
         prereq = mp.prerequisite_branch
         if not prereq or prereq.lifecycle_status == 'Merged':
@@ -208,7 +196,7 @@
         parser.print_usage()
         return 1
     project = args[0]
-    bzrlib_setup()
+    breezy_setup()
     launchpad = hydrazine.create_session()
     project = launchpad.projects[project]
     i = 0
@@ -235,7 +223,7 @@
             elif whatnow == 'm':
                 set_message(mp)
             elif whatnow == 's':
-                print "Sorry, not currently implemented %r" % whatnow
+                print("Sorry, not currently implemented %r" % whatnow)
                 """
                 queue_mp(launchpad, mp)
                 if mp.queue_status not in find_status:
@@ -253,8 +241,8 @@
             elif whatnow == '':
                 continue
             else:
-                print "Sorry, don't understand %r" % whatnow
-    print "No remaining merge proposals ready to be merged."
+                print("Sorry, don't understand %r" % whatnow)
+    print("No remaining merge proposals ready to be merged.")
     return 0
 
 if __name__ == '__main__':

=== modified file 'lp-attach'
--- lp-attach	2010-06-30 00:13:48 +0000
+++ lp-attach	2021-05-03 12:32:54 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 #
 # Copyright (C) 2010 Canonical Ltd
 
@@ -35,7 +35,7 @@
 def guess_mime_type(attachment_bytes):
     try:
         import magic
-    except ImportError, e:
+    except ImportError as e:
         sys.stderr.write("can't guess mime-types without the python-magic library: %s" % e)
         mimetype = None
     else:
@@ -43,13 +43,13 @@
         mimetype = mime.buffer(attachment_bytes)
     if mimetype is None:
         mimetype = 'application/binary'
-    print 'attachment type %s' % mimetype
+    print('attachment type %s' % mimetype)
     return mimetype
 
 
 def main(argv):
     if len(argv) != 2 or argv[1] == '--help':
-        print __doc__
+        print(__doc__)
         return 3
 
     try:
@@ -59,23 +59,23 @@
         return 1
 
     launchpad = hydrazine.create_session()
-    print "getting bug %s" % bugnumber
+    print("getting bug %s" % bugnumber)
     bug = launchpad.bugs[bugnumber]
-    print 'Attaching to %s' % bug
+    print('Attaching to %s' % bug)
 
     attachment_bytes = sys.stdin.read()
-    print '%d bytes to attach' % len(attachment_bytes)
+    print('%d bytes to attach' % len(attachment_bytes))
 
     mime_type = guess_mime_type(attachment_bytes)
 
     # mime type must be specified otherwise
     # <https://bugs.edge.launchpad.net/malone/+bug/204560> assumes it's
     # chemical/x-mopac-input
-    print bug.addAttachment(comment='',
+    print(bug.addAttachment(comment='',
         data=attachment_bytes,
         description='',
         filename='attachment',
-        content_type=mime_type)
+        content_type=mime_type))
 
 
 if __name__ == '__main__':

=== modified file 'lp-delete-ppa-packages'
--- lp-delete-ppa-packages	2013-03-23 22:51:00 +0000
+++ lp-delete-ppa-packages	2021-05-03 12:32:54 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 USAGE = """\
 usage: %prog [options] PPA
@@ -32,7 +32,7 @@
                 kw['source_name'] = spn
             filter_kwargs.append(kw)
     
-    print "Querying PPA..."
+    print("Querying PPA...")
     archive = lp.people[team].getPPAByName(name=ppa)
     sources = []
     for kwargs in filter_kwargs:
@@ -43,7 +43,7 @@
         version = spph.source_package_version
         series = spph.distro_series_link.split('/')[-1]
         status = spph.status
-        print value, package, series, version, status
+        print(value, package, series, version, status)
 
     if sources and not dry_run:
         sys.stdout.write('Deleting')

=== modified file 'lp-promote-ppa'
--- lp-promote-ppa	2013-03-23 22:49:55 +0000
+++ lp-promote-ppa	2021-05-03 12:32:54 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 USAGE = """\
 usage: %prog [options] SOURCE-PPA DESTINATION-PPA
@@ -49,7 +49,7 @@
                 kw['source_name'] = spn
             filter_kwargs.append(kw)
     
-    print "Querying destination PPA..."
+    print("Querying destination PPA...")
     to_archive = lp.people[to_team].getPPAByName(name=to_ppa)
     dest_sources = []
     for kwargs in filter_kwargs:
@@ -63,12 +63,12 @@
         series = spph.distro_series_link.split('/')[-1]
         status = spph.status
         buildstate = buildsumm[value]['status']
-        print value, package, series, version, status, buildstate
+        print(value, package, series, version, status, buildstate)
         destination_sourcepubs[package, series] = version
 
-    print
+    print()
 
-    print "Querying source PPA..."
+    print("Querying source PPA...")
     from_archive = lp.people[from_team].getPPAByName(name=from_ppa)
     src_sources = []
     for kwargs in filter_kwargs:
@@ -95,16 +95,16 @@
                 note = "*** UPDATED ***"
             elif c < 0:
                 note = "*** NEWER IN DESTINATION ***"
-        print value, package, series, version, status, buildstate, note
+        print(value, package, series, version, status, buildstate, note)
 
     if sourcepub_elts:
-        print
+        print()
 
     for name, version, series in sourcepub_elts:
         if dry_run:
-            print "Would syncSource(%s, %s, %s)" % (name, version, series)
+            print("Would syncSource(%s, %s, %s)" % (name, version, series))
         else:
-            print "syncSource(%s, %s, %s)..." % (name, version, series)
+            print("syncSource(%s, %s, %s)..." % (name, version, series))
             to_archive.syncSource(from_archive=from_archive,
                     include_binaries=True, source_name=name,
                     to_pocket="Release", to_series=series,

=== modified file 'scan-merge-proposals'
--- scan-merge-proposals	2011-04-06 01:30:20 +0000
+++ scan-merge-proposals	2021-05-03 12:32:54 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 #
 # Copyright (C) 2009 Canonical Ltd 
 
@@ -41,7 +41,7 @@
 
 def main(argv):
     if len(argv) != 2:
-        print __doc__
+        print(__doc__)
         return 3
     
     launchpad = hydrazine.create_session()
@@ -59,26 +59,26 @@
         if mp.queue_status not in ['Needs review',
             'Approved',]:
             continue
-        print mp.web_link
+        print(mp.web_link)
         # registrant is the registrant of the proposed-to-merge branch, ie
         # pretty much the owner of that branch
         registrant_name = mp.registrant.name
         if registrant_name in needs_to_sign:
-            print '     %s already needs to sign' % registrant_name
+            print('     %s already needs to sign' % registrant_name)
         elif registrant_name not in ok_people:
-            print '**** %s not signed up' % registrant_name
+            print('**** %s not signed up' % registrant_name)
             needs_to_sign[registrant_name] = mp.registrant
         else:
-            print '<<<< yay, a member of %s' % ok_people[mp.registrant.name]
-        print '    status %s' % mp.queue_status
-        print
+            print('<<<< yay, a member of %s' % ok_people[mp.registrant.name])
+        print('    status %s' % mp.queue_status)
+        print()
 
     if needs_to_sign:
-        print 
-        print 'The following people need to sign the contributor agreement'
+        print() 
+        print('The following people need to sign the contributor agreement')
         for person_name, person in sorted(needs_to_sign.items()):
             real_url = person.web_link
-            print '%s <%s>' % (person.display_name, real_url)
+            print('%s <%s>' % (person.display_name, real_url))
 
     return 0
 

=== modified file 'setup.py'
--- setup.py	2010-12-02 00:01:31 +0000
+++ setup.py	2021-05-03 12:32:54 +0000
@@ -1,9 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 from distutils.core import setup
 from os.path import join, dirname
 
-description = file(join(dirname(__file__), 'README'), 'rb').read()
+description = open(join(dirname(__file__), 'README'), 'r').read()
 
 setup(
     name='hydrazine',