Merge lp:~cjwatson/storm/py3-exceptions into lp:storm

[Colin Watson]

Use Python 3-friendly "except" syntax.

This is a tiny subset of Thiago Bellini's work in https://code.launchpad.net/~bellini666/storm/py3/+merge/325182, though I did this part of it independently. I'm trying to carve out some of the straightforward mechanical changes from that branch in order to make it reviewable in a reasonable amount of time.

[Simon Poirier (simpoir)]

+1 LGTM

<3 short mechanical reviews

review: Approve

=== modified file 'storm/__init__.py'
--- storm/__init__.py	2013-06-28 09:56:58 +0000
+++ storm/__init__.py	2019-05-30 13:43:46 +0000
@@ -53,6 +53,6 @@
     try:
         from storm import cextensions
         has_cextensions = True
-    except ImportError, e:
+    except ImportError as e:
         if "cextensions" not in str(e):
            raise
 
=== modified file 'storm/database.py'
--- storm/database.py	2015-06-15 13:42:07 +0000
+++ storm/database.py	2019-05-30 13:43:46 +0000
@@ -318,7 +318,7 @@
                         self._raw_connection.tpc_rollback()
                     else:
                         self._raw_connection.rollback()
-                except Error, exc:
+                except Error as exc:
                     if self.is_disconnection_error(exc):
                         self._raw_connection = None
                         self._state = STATE_RECONNECT
@@ -386,7 +386,7 @@
         """Complete the statement execution, along with result reports."""
         try:
             self._check_disconnect(raw_cursor.execute, *args)
-        except Exception, error:
+        except Exception as error:
             self._check_disconnect(
                 trace, "connection_raw_execute_error", self, raw_cursor,
                 statement, params or (), error)
@@ -402,7 +402,7 @@
             self._check_disconnect(
                 trace, "connection_raw_execute", self, raw_cursor,
                 statement, params or ())
-        except Exception, error:
+        except Exception as error:
             self._check_disconnect(
                 trace, "connection_raw_execute_error", self, raw_cursor,
                 statement, params or (), error)
@@ -423,7 +423,7 @@
         elif self._state == STATE_RECONNECT:
             try:
                 self._raw_connection = self._database.raw_connect()
-            except DatabaseError, exc:
+            except DatabaseError as exc:
                 self._state = STATE_DISCONNECTED
                 self._raw_connection = None
                 raise DisconnectionError(str(exc))
@@ -452,7 +452,7 @@
             'extra_disconnection_errors', ())
         try:
             return function(*args, **kwargs)
-        except Exception, exc:
+        except Exception as exc:
             if self.is_disconnection_error(exc, extra_disconnection_errors):
                 self._state = STATE_DISCONNECTED
                 self._raw_connection = None
 
=== modified file 'storm/databases/sqlite.py'
--- storm/databases/sqlite.py	2015-06-15 12:02:12 +0000
+++ storm/databases/sqlite.py	2019-05-30 13:43:46 +0000
@@ -157,7 +157,7 @@
         while True:
             try:
                 return Connection.raw_execute(self, statement, params)
-            except sqlite.OperationalError, e:
+            except sqlite.OperationalError as e:
                 if str(e) != "database is locked":
                     raise
                 elif now() - started < self._database._timeout:
 
=== modified file 'storm/schema/schema.py'
--- storm/schema/schema.py	2015-01-26 09:57:25 +0000
+++ storm/schema/schema.py	2019-05-30 13:43:46 +0000
@@ -172,7 +172,7 @@
         except SchemaMissingError:
             # No schema at all. Create it from the ground.
             self.create(store)
-        except UnappliedPatchesError, error:
+        except UnappliedPatchesError as error:
             patch_applier.check_unknown()
             for version in error.unapplied_versions:
                 self.advance(store, version)
 
=== modified file 'storm/schema/sharding.py'
--- storm/schema/sharding.py	2014-12-28 11:51:53 +0000
+++ storm/schema/sharding.py	2019-05-30 13:43:46 +0000
@@ -101,7 +101,7 @@
                 schema.check(store)
             except SchemaMissingError:
                 schema.create(store)
-            except UnappliedPatchesError, error:
+            except UnappliedPatchesError as error:
                 if not unapplied_versions:
                     unapplied_versions = error.unapplied_versions
                 elif unapplied_versions != error.unapplied_versions:
 
=== modified file 'storm/twisted/transact.py'
--- storm/twisted/transact.py	2011-12-07 10:39:57 +0000
+++ storm/twisted/transact.py	2019-05-30 13:43:46 +0000
@@ -75,7 +75,7 @@
             try:
                 result = function(*args, **kwargs)
                 self._transaction.commit()
-            except RETRIABLE_ERRORS, error:
+            except RETRIABLE_ERRORS as error:
                 if isinstance(error, DisconnectionError):
                     # If we got a disconnection, calling rollback may not be
                     # enough because psycopg2 doesn't necessarily use the
 
=== modified file 'tests/databases/base.py'
--- tests/databases/base.py	2016-03-10 12:04:01 +0000
+++ tests/databases/base.py	2019-05-30 13:43:46 +0000
@@ -344,7 +344,7 @@
                 connection2.execute("UPDATE test SET title='Title 100' "
                                     "WHERE id=10")
                 connection2.commit()
-            except OperationalError, e:
+            except OperationalError as e:
                 self.assertEquals(str(e), "database is locked") # SQLite blocks
             result = connection1.execute("SELECT title FROM test WHERE id=10")
             self.assertEquals(result.get_one(), ("Title 10",))
@@ -770,7 +770,7 @@
             cursor = self.connection._raw_connection.cursor()
             cursor.execute("SELECT 1")
             cursor.fetchone()
-        except Error, exc:
+        except Error as exc:
             self.assertTrue(self.connection.is_disconnection_error(exc))
         else:
             self.fail("Disconnection was not caught.")
@@ -779,7 +779,7 @@
         # error when called.
         try:
             self.connection._raw_connection.rollback()
-        except Error, exc:
+        except Error as exc:
             self.assertTrue(self.connection.is_disconnection_error(exc))
         else:
             self.fail("Disconnection was not raised.")
@@ -803,7 +803,7 @@
             cursor = self.connection._raw_connection.cursor()
             cursor.execute("SELECT 1")
             cursor.fetchone()
-        except DatabaseError, exc:
+        except DatabaseError as exc:
             self.assertTrue(self.connection.is_disconnection_error(exc))
         else:
             self.fail("Disconnection was not caught.")
 
=== modified file 'tests/databases/postgres.py'
--- tests/databases/postgres.py	2016-04-29 08:38:51 +0000
+++ tests/databases/postgres.py	2019-05-30 13:43:46 +0000
@@ -741,7 +741,7 @@
         self.connection._raw_connection = FakeConnection()
         try:
             self.connection.rollback()
-        except Exception, exc:
+        except Exception as exc:
             self.fail('Exception should have been swallowed: %s' % repr(exc))
 
 
@@ -875,7 +875,7 @@
         self.remaining_time = 0.001
         try:
             self.connection.execute(statement)
-        except TimeoutError, e:
+        except TimeoutError as e:
             self.assertEqual("SQL server cancelled statement", e.message)
             self.assertEqual(statement, e.statement)
             self.assertEqual((), e.params)
 
=== modified file 'tests/databases/sqlite.py'
--- tests/databases/sqlite.py	2013-05-05 10:36:13 +0000
+++ tests/databases/sqlite.py	2019-05-30 13:43:46 +0000
@@ -114,7 +114,7 @@
         started = time.time()
         try:
             connection2.execute("INSERT INTO test VALUES (2)")
-        except OperationalError, exception:
+        except OperationalError as exception:
             self.assertEquals(str(exception), "database is locked")
             self.assertTrue(time.time()-started >= 0.3)
         else:
@@ -141,7 +141,7 @@
         started = time.time()
         try:
             connection1.commit()
-        except OperationalError, exception:
+        except OperationalError as exception:
             self.assertEquals(str(exception), "database is locked")
             # In 0.10, the next assertion failed because the timeout wasn't
             # enforced for the "COMMIT" statement.
 
=== modified file 'tests/mocker.py'
--- tests/mocker.py	2008-05-18 10:22:29 +0000
+++ tests/mocker.py	2019-05-30 13:43:46 +0000
@@ -487,7 +487,7 @@
         for event in self._events:
             try:
                 event.verify()
-            except AssertionError, e:
+            except AssertionError as e:
                 error = str(e)
                 if not error:
                     raise RuntimeError("Empty error message from %r"
@@ -1029,7 +1029,7 @@
             path.root_object = object
         try:
             return self.__mocker__.act(path)
-        except MatchError, exception:
+        except MatchError as exception:
             root_mock = path.root_mock
             if (path.root_object is not None and
                 root_mock.__mocker_passthrough__):
@@ -1037,7 +1037,7 @@
             # Reinstantiate to show raise statement on traceback, and
             # also to make the traceback shown shorter.
             raise MatchError(str(exception))
-        except AssertionError, e:
+        except AssertionError as e:
             lines = str(e).splitlines()
             message = [ERROR_PREFIX + "Unmet expectation:", ""]
             message.append("=> " + lines.pop(0))
@@ -1083,7 +1083,7 @@
         # something that doesn't offer them.
         try:
             result = self.__mocker_act__("len")
-        except MatchError, e:
+        except MatchError as e:
             raise AttributeError(str(e))
         if type(result) is Mock:
             return 0
@@ -1092,7 +1092,7 @@
     def __nonzero__(self):
         try:
             return self.__mocker_act__("nonzero")
-        except MatchError, e:
+        except MatchError as e:
             return True
 
     def __iter__(self):
@@ -1519,7 +1519,7 @@
         for task in self._tasks:
             try:
                 task_result = task.run(path)
-            except AssertionError, e:
+            except AssertionError as e:
                 error = str(e)
                 if not error:
                     raise RuntimeError("Empty error message from %r" % task)
@@ -1562,7 +1562,7 @@
         for task in self._tasks:
             try:
                 task.verify()
-            except AssertionError, e:
+            except AssertionError as e:
                 error = str(e)
                 if not error:
                     raise RuntimeError("Empty error message from %r" % task)
 
=== modified file 'tests/schema/patch.py'
--- tests/schema/patch.py	2014-12-18 10:57:52 +0000
+++ tests/schema/patch.py	2019-05-30 13:43:46 +0000
@@ -345,7 +345,7 @@
         self.add_module("patch_999.py", patch_no_args_apply)
         try:
             self.patch_applier.apply_all()
-        except BadPatchError, e:
+        except BadPatchError as e:
             self.assertTrue("mypackage/patch_999.py" in str(e))
             self.assertTrue("takes no arguments" in str(e))
             self.assertTrue("TypeError" in str(e))
@@ -360,7 +360,7 @@
         self.add_module("patch_999.py", patch_missing_apply)
         try:
             self.patch_applier.apply_all()
-        except BadPatchError, e:
+        except BadPatchError as e:
             self.assertTrue("mypackage/patch_999.py" in str(e))
             self.assertTrue("no attribute" in str(e))
             self.assertTrue("AttributeError" in str(e))
@@ -375,7 +375,7 @@
         self.add_module("patch_999.py", "that's not python")
         try:
             self.patch_applier.apply_all()
-        except BadPatchError, e:
+        except BadPatchError as e:
             self.assertTrue(" 999 " in str(e))
             self.assertTrue("SyntaxError" in str(e))
         else:
@@ -389,7 +389,7 @@
         self.add_module("patch_999.py", patch_name_error)
         try:
             self.patch_applier.apply_all()
-        except BadPatchError, e:
+        except BadPatchError as e:
             self.assertTrue("mypackage/patch_999.py" in str(e))
             self.assertTrue("NameError" in str(e))
             self.assertTrue("blah" in str(e))
 
=== modified file 'tests/store/base.py'
--- tests/store/base.py	2019-05-29 15:35:00 +0000
+++ tests/store/base.py	2019-05-30 13:43:46 +0000
@@ -5929,7 +5929,7 @@
             self.store.commit()
             try:
                 self.assertEquals(myfoo.title, title)
-            except AssertionError, e:
+            except AssertionError as e:
                 raise AssertionError(unicode(e, 'replace') +
                     " (ensure your database was created with CREATE DATABASE"
                     " ... CHARACTER SET utf8)")
 
=== modified file 'tests/tracer.py'
--- tests/tracer.py	2012-06-28 14:21:49 +0000
+++ tests/tracer.py	2019-05-30 13:43:46 +0000
@@ -290,7 +290,7 @@
 
         try:
             self.execute()
-        except TimeoutError, e:
+        except TimeoutError as e:
             self.assertEqual("0 seconds remaining in time budget", e.message)
             self.assertEqual(self.statement, e.statement)
             self.assertEqual(self.params, e.params)
@@ -662,7 +662,7 @@
         try:
             with CaptureTracer():
                 raise RuntimeError("boom")
-        except RuntimeError, error:
+        except RuntimeError as error:
             errors.append(error)
         [error] = errors
         self.assertEqual("boom", str(error))
 
=== modified file 'tests/variables.py'
--- tests/variables.py	2019-04-07 16:20:40 +0000
+++ tests/variables.py	2019-05-30 13:43:46 +0000
@@ -143,7 +143,7 @@
         variable = CustomVariable(allow_none=False, column=column)
         try:
             variable.set(None)
-        except NoneError, e:
+        except NoneError as e:
             pass
         self.assertTrue("column_name" in str(e))
 
@@ -152,7 +152,7 @@
         variable = CustomVariable(allow_none=False, column=column)
         try:
             variable.set(None)
-        except NoneError, e:
+        except NoneError as e:
             pass
         self.assertTrue("table_name.column_name" in str(e))
 
@@ -769,7 +769,7 @@
     def test_unsupported_unit(self):
         try:
             self.check("1 month", None)
-        except ValueError, e:
+        except ValueError as e:
             self.assertEquals(str(e), "Unsupported interval unit 'month' "
                                       "in interval '1 month'")
         else:
@@ -778,7 +778,7 @@
     def test_missing_value(self):
         try:
             self.check("day", None)
-        except ValueError, e:
+        except ValueError as e:
             self.assertEquals(str(e), "Expected an interval value rather than "
                                       "'day' in interval 'day'")
         else:
 
=== modified file 'tests/zope/zstorm.py'
--- tests/zope/zstorm.py	2012-03-06 10:28:06 +0000
+++ tests/zope/zstorm.py	2019-05-30 13:43:46 +0000
@@ -355,7 +355,7 @@
                     store.execute("SELECT 1")
                 except ZStormError:
                     failures.append("ZStormError raised")
-                except Exception, exc:
+                except Exception as exc:
                     failures.append("Expected ZStormError, got %r" % exc)
                 else:
                     failures.append("Expected ZStormError, nothing raised")