Merge ~cjwatson/launchpad:py3-raise-except into launchpad:master

[Colin Watson]

Use Python 3-style raise/except syntax

[Kristian Glass (doismellburning)]

review: Approve

[Colin Watson (cjwatson)]

Self-approving to work around incorrect repository reviewer (which I've now fixed).

review: Approve

diff --git a/database/schema/dbcontroller.py b/database/schema/dbcontroller.py
index b9a38a5..4b92935 100644
--- a/database/schema/dbcontroller.py
+++ b/database/schema/dbcontroller.py
@@ -104,7 +104,7 @@ class DBController:
                 con = pg_connect(conn_str)
                 cur = con.cursor()
                 cur.execute('select pg_wal_replay_pause()')
-            except psycopg2.Error, x:
+            except psycopg2.Error as x:
                 self.log.error(
                     'Unable to pause replication to %s (%s).'
                     % (name, str(x)))
@@ -120,7 +120,7 @@ class DBController:
                 con = pg_connect(conn_str)
                 cur = con.cursor()
                 cur.execute('select pg_wal_replay_resume()')
-            except psycopg2.Error, x:
+            except psycopg2.Error as x:
                 success = False
                 self.log.error(
                     'Failed to resume replication to %s (%s).'
@@ -146,7 +146,7 @@ class DBController:
                     self.log.warn("Replication paused on %s. Resuming.", name)
                     cur.execute("SELECT pg_wal_replay_resume()")
                     wait_for_sync = True
-            except psycopg2.Error, x:
+            except psycopg2.Error as x:
                 success = False
                 self.log.error(
                     "Failed to resume replication on %s (%s)", name, str(x))
@@ -159,7 +159,7 @@ class DBController:
             self.pgbouncer_cmd("DISABLE %s" % name, results=False)
             self.pgbouncer_cmd("KILL %s" % name, results=False)
             return True
-        except psycopg2.Error, x:
+        except psycopg2.Error as x:
             self.log.error("Unable to disable %s (%s)", name, str(x))
             return False
 
@@ -168,7 +168,7 @@ class DBController:
             self.pgbouncer_cmd("RESUME %s" % name, results=False)
             self.pgbouncer_cmd("ENABLE %s" % name, results=False)
             return True
-        except psycopg2.Error, x:
+        except psycopg2.Error as x:
             self.log.error("Unable to enable %s (%s)", name, str(x))
             return False
 
diff --git a/database/schema/full-update.py b/database/schema/full-update.py
index 1e48fbb..8c9b550 100755
--- a/database/schema/full-update.py
+++ b/database/schema/full-update.py
@@ -105,7 +105,7 @@ def main():
         # Master connection, not running in autocommit to allow us to
         # rollback changes on failure.
         master_con = psycopg2.connect(str(controller.master))
-    except Exception, x:
+    except Exception as x:
         log.fatal("Unable to open connection to master db (%s)", str(x))
         return 94
 
diff --git a/lib/lp/services/database/policy.py b/lib/lp/services/database/policy.py
index 64213bc..066fdb3 100644
--- a/lib/lp/services/database/policy.py
+++ b/lib/lp/services/database/policy.py
@@ -96,7 +96,7 @@ def get_connected_store(name, flavor):
         # be put into reconnect state at the end of the transaction.
         store._connection._event.emit('register-transaction')
         raise
-    except psycopg2.OperationalError, exc:
+    except psycopg2.OperationalError as exc:
         # Per Bug #1025264, Storm emits psycopg2 errors when we
         # want DisconnonnectionErrors, eg. attempting to open a
         # new connection to a non-existent database.
diff --git a/lib/lp/services/feeds/stories/xx-navigation.txt b/lib/lp/services/feeds/stories/xx-navigation.txt
index ba45644..5ed27dd 100644
--- a/lib/lp/services/feeds/stories/xx-navigation.txt
+++ b/lib/lp/services/feeds/stories/xx-navigation.txt
@@ -104,7 +104,7 @@ on feeds.launchpad.test and does not work on all the other vhosts.
     ...             print "Error accessing:", url
     ...             raise
     ...         else:
-    ...             raise AssertionError, "Page should not exist: %s" % url
+    ...             raise AssertionError("Page should not exist: %s" % url)
 
 These atom feeds should only exist on feeds.launchpad.test:
 
diff --git a/lib/lp/services/librarian/client.py b/lib/lp/services/librarian/client.py
index 5a87bbd..edb1d72 100644
--- a/lib/lp/services/librarian/client.py
+++ b/lib/lp/services/librarian/client.py
@@ -343,7 +343,7 @@ class FileDownloadClient:
     #     lines = results.split('\n')
     #     count, paths = lines[0], lines[1:]
     #     if int(count) != len(paths):
-    #         raise DownloadFailed, 'Incomplete response'
+    #         raise DownloadFailed('Incomplete response')
     #     return paths
 
     def _getAlias(self, aliasID, secure=False):
diff --git a/lib/lp/translations/doc/poexport-queue.txt b/lib/lp/translations/doc/poexport-queue.txt
index dab4576..58d9317 100644
--- a/lib/lp/translations/doc/poexport-queue.txt
+++ b/lib/lp/translations/doc/poexport-queue.txt
@@ -37,7 +37,7 @@ exception handling so we can get the exception error:
 Record the error.
 
     >>> try:
-    ...     raise AssertionError, "It's just an error for testing purposes"
+    ...     raise AssertionError("It's just an error for testing purposes")
     ... except AssertionError:
     ...     result.addFailure()
 
@@ -131,7 +131,7 @@ characters and can't be reported without triggering an error themselves.
 Those are specially handled and reported.
 
     >>> try:
-    ...     raise AssertionError, b"Really nasty \xc3 non-ASCII error!"
+    ...     raise AssertionError(b"Really nasty \xc3 non-ASCII error!")
     ... except AssertionError:
     ...     result.addFailure()
     >>> result.notify()
diff --git a/lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt b/lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt
index d4e9a57..a15080f 100644
--- a/lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt
+++ b/lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt
@@ -30,12 +30,12 @@ We are in read only mode, so there shouldn't be any textareas:
     >>> main_content = find_tag_by_id(
     ...     browser.contents, 'messages_to_translate')
     >>> for textarea in main_content.findAll('textarea'):
-    ...     raise AssertionError, 'Found textarea:\n%s' % textarea
+    ...     raise AssertionError('Found textarea:\n%s' % textarea)
 
 Neither any input widget:
 
     >>> for input in main_content.findAll('input'):
-    ...     raise AssertionError, 'Found input:\n%s' % input
+    ...     raise AssertionError('Found input:\n%s' % input)
 
 As an anynoymous user you will have access to the download and details
 pages for the pofile this message belongs to. The link to upload page