From 96896fd2c8aec02837a9dc11e854c20752a3fc3b Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 4 Sep 2019 17:25:14 -0300 Subject: [PATCH] Port ubuntu-upload-permission to Python 3 --- setup.py | 2 +- ubuntu-upload-permission | 48 +++++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/setup.py b/setup.py index 213bf0e..d2b10b2 100755 --- a/setup.py +++ b/setup.py @@ -44,6 +44,7 @@ if sys.version_info[0] >= 3: 'syncpackage', 'ubuntu-build', 'ubuntu-iso', + 'ubuntu-upload-permission', ] data_files = [ ('share/bash-completion/completions', glob.glob("bash_completion/*")), @@ -55,7 +56,6 @@ else: scripts = [ 'import-bug-from-debian', 'merge-changelog', - 'ubuntu-upload-permission', 'update-maintainer', ] data_files = [] diff --git a/ubuntu-upload-permission b/ubuntu-upload-permission index 1c4c20e..2099134 100755 --- a/ubuntu-upload-permission +++ b/ubuntu-upload-permission @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Copyright (C) 2011, Stefano Rivera # @@ -62,13 +62,13 @@ def main(): try: release, pocket = split_release_pocket(options.release) series = ubuntu.getSeries(release) - except SeriesNotFoundException, e: + except SeriesNotFoundException as e: Logger.error(str(e)) sys.exit(2) try: spph = archive.getSourcePackage(package) - except PackageNotFoundException, e: + except PackageNotFoundException as e: Logger.error(str(e)) sys.exit(2) component = spph.getComponent() @@ -77,44 +77,46 @@ def main(): component_uploader = archive.getUploadersForComponent( component_name=component)[0] - print "All upload permissions for %s:" % package - print - print "Component (%s)" % component - print "============" + ("=" * len(component)) + print("All upload permissions for %s:" % package) + print() + print("Component (%s)" % component) + print("============" + ("=" * len(component))) print_uploaders([component_uploader], options.list_team_members) packagesets = sorted(Packageset.setsIncludingSource( distroseries=series, sourcepackagename=package)) if packagesets: - print - print "Packagesets" - print "===========" + print() + print("Packagesets") + print("===========") for packageset in packagesets: - print - print "%s:" % packageset.name + print() + print("%s:" % packageset.name) print_uploaders(archive.getUploadersForPackageset( packageset=packageset), options.list_team_members) ppu_uploaders = archive.getUploadersForPackage( source_package_name=package) if ppu_uploaders: - print - print "Per-Package-Uploaders" - print "=====================" - print + print() + print("Per-Package-Uploaders") + print("=====================") + print() print_uploaders(ppu_uploaders, options.list_team_members) - print + print() if PersonTeam.me.canUploadPackage(archive, series, package, component, pocket): - print "You can upload %s to %s." % (package, options.release) + print("You can upload %s to %s." % (package, options.release)) else: - print("You can not upload %s to %s, yourself." % (package, options.release)) + print("You can not upload %s to %s, yourself." + % (package, options.release)) if (series.status in ('Current Stable Release', 'Supported', 'Obsolete') and pocket == 'Release'): - print("%s is in the '%s' state. You may want to query the %s-proposed pocket." % - (release, series.status, release)) + print(("%s is in the '%s' state. You may want to query the " + "%s-proposed pocket.") + % (release, series.status, release)) else: print("But you can still contribute to it via the sponsorship " "process: https://wiki.ubuntu.com/SponsorshipProcess") @@ -131,9 +133,9 @@ def print_uploaders(uploaders, expand_teams=False, prefix=''): recursion. """ for uploader in sorted(uploaders, key=lambda p: p.display_name): - print("%s* %s (%s)%s" % + print(("%s* %s (%s)%s" % (prefix, uploader.display_name, uploader.name, - ' [team]' if uploader.is_team else '')) + ' [team]' if uploader.is_team else ''))) if expand_teams and uploader.is_team: print_uploaders(uploader.participants, True, prefix=prefix + ' ')