Port pull-uca-source to Python 3

This commit is contained in:
Stefano Rivera 2019-09-04 15:53:03 -03:00
parent 4239d49582
commit 0de4509da6
3 changed files with 6 additions and 5 deletions

1
debian/control vendored
View File

@ -68,6 +68,7 @@ Depends:
python3-distro-info, python3-distro-info,
python3-httplib2, python3-httplib2,
python3-launchpadlib, python3-launchpadlib,
python3-lazr.restfulclient,
python3-ubuntutools, python3-ubuntutools,
sensible-utils, sensible-utils,
sudo, sudo,

View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python3
# #
# pull-uca-source -- pull a source package from Ubuntu Cloud Archive # pull-uca-source -- pull a source package from Ubuntu Cloud Archive
# Basic usage: pull-uca-source <source package> <openstack release> [version] # Basic usage: pull-uca-source <source package> <openstack release> [version]
@ -118,12 +118,12 @@ def main():
pocket = None pocket = None
try: try:
(release, pocket) = split_release_pocket(release, default=None) (release, pocket) = split_release_pocket(release, default=None)
except PocketDoesNotExistError, e: except PocketDoesNotExistError as e:
pass pass
try: try:
archive = uca.getPPAByName(name="%s-staging" % release) archive = uca.getPPAByName(name="%s-staging" % release)
except NotFound, e: except NotFound as e:
Logger.error('Archive does not exist for Openstack release: %s', Logger.error('Archive does not exist for Openstack release: %s',
release) release)
showOpenstackReleases(uca) showOpenstackReleases(uca)
@ -143,7 +143,7 @@ def main():
try: try:
srcpkg.pull() srcpkg.pull()
except DownloadError, e: except DownloadError as e:
Logger.error('Failed to download: %s', str(e)) Logger.error('Failed to download: %s', str(e))
sys.exit(1) sys.exit(1)
if not options.download_only: if not options.download_only:

View File

@ -32,6 +32,7 @@ if sys.version_info[0] >= 3:
'pull-debian-source', 'pull-debian-source',
'pull-lp-source', 'pull-lp-source',
'pull-revu-source', 'pull-revu-source',
'pull-uca-source',
'reverse-build-depends', 'reverse-build-depends',
'setup-packaging-environment', 'setup-packaging-environment',
] ]
@ -45,7 +46,6 @@ else:
scripts = [ scripts = [
'import-bug-from-debian', 'import-bug-from-debian',
'merge-changelog', 'merge-changelog',
'pull-uca-source',
'requestbackport', 'requestbackport',
'requestsync', 'requestsync',
'reverse-depends', 'reverse-depends',