From 0de4509da6d3090a31d55f4b312a9ead26ac5ccc Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@ubuntu.com>
Date: Wed, 4 Sep 2019 15:53:03 -0300
Subject: [PATCH] Port pull-uca-source to Python 3

---
 debian/control  | 1 +
 pull-uca-source | 8 ++++----
 setup.py        | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 5759994..a5fd272 100644
--- a/debian/control
+++ b/debian/control
@@ -68,6 +68,7 @@ Depends:
  python3-distro-info,
  python3-httplib2,
  python3-launchpadlib,
+ python3-lazr.restfulclient,
  python3-ubuntutools,
  sensible-utils,
  sudo,
diff --git a/pull-uca-source b/pull-uca-source
index 79a60f5..4c4c250 100755
--- a/pull-uca-source
+++ b/pull-uca-source
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # pull-uca-source -- pull a source package from Ubuntu Cloud Archive
 # Basic usage: pull-uca-source <source package> <openstack release> [version]
@@ -118,12 +118,12 @@ def main():
     pocket = None
     try:
         (release, pocket) = split_release_pocket(release, default=None)
-    except PocketDoesNotExistError, e:
+    except PocketDoesNotExistError as e:
         pass
 
     try:
         archive = uca.getPPAByName(name="%s-staging" % release)
-    except NotFound, e:
+    except NotFound as e:
         Logger.error('Archive does not exist for Openstack release: %s',
                      release)
         showOpenstackReleases(uca)
@@ -143,7 +143,7 @@ def main():
 
     try:
         srcpkg.pull()
-    except DownloadError, e:
+    except DownloadError as e:
         Logger.error('Failed to download: %s', str(e))
         sys.exit(1)
     if not options.download_only:
diff --git a/setup.py b/setup.py
index 797d7bb..c8c0346 100755
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,7 @@ if sys.version_info[0] >= 3:
         'pull-debian-source',
         'pull-lp-source',
         'pull-revu-source',
+        'pull-uca-source',
         'reverse-build-depends',
         'setup-packaging-environment',
     ]
@@ -45,7 +46,6 @@ else:
     scripts = [
         'import-bug-from-debian',
         'merge-changelog',
-        'pull-uca-source',
         'requestbackport',
         'requestsync',
         'reverse-depends',