← Back to branch summary

~cjwatson/storm/py3-dict

« back to all changes in this revision

Viewing changes to tests/databases/base.py

  • Committer: Colin Watson
  • Date: 2019-05-31 15:28:04 UTC
  • mfrom: (487.2.2 py3-exceptions)
  • Revision ID: cjwatson@canonical.com-20190531152804-jk4ykojm7k1fvjtf
Use Python 3-friendly "except" syntax. [r=simpoir]

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/databases/base.py
344
344
                connection2.execute("UPDATE test SET title='Title 100' "
345
345
                                    "WHERE id=10")
346
346
                connection2.commit()
347
 
            except OperationalError, e:
 
347
            except OperationalError as e:
348
348
                self.assertEquals(str(e), "database is locked") # SQLite blocks
349
349
            result = connection1.execute("SELECT title FROM test WHERE id=10")
350
350
            self.assertEquals(result.get_one(), ("Title 10",))
770
770
            cursor = self.connection._raw_connection.cursor()
771
771
            cursor.execute("SELECT 1")
772
772
            cursor.fetchone()
773
 
        except Error, exc:
 
773
        except Error as exc:
774
774
            self.assertTrue(self.connection.is_disconnection_error(exc))
775
775
        else:
776
776
            self.fail("Disconnection was not caught.")
779
779
        # error when called.
780
780
        try:
781
781
            self.connection._raw_connection.rollback()
782
 
        except Error, exc:
 
782
        except Error as exc:
783
783
            self.assertTrue(self.connection.is_disconnection_error(exc))
784
784
        else:
785
785
            self.fail("Disconnection was not raised.")
803
803
            cursor = self.connection._raw_connection.cursor()
804
804
            cursor.execute("SELECT 1")
805
805
            cursor.fetchone()
806
 
        except DatabaseError, exc:
 
806
        except DatabaseError as exc:
807
807
            self.assertTrue(self.connection.is_disconnection_error(exc))
808
808
        else:
809
809
            self.fail("Disconnection was not caught.")