← Back to branch summary

~jseutter/storm/py3_exceptions

« back to all changes in this revision

Viewing changes to tests/databases/base.py

  • Committer: Jerry Seutter
  • Date: 2012-05-09 12:57:22 UTC
  • Revision ID: jerry.seutter@canonical.com-20120509125722-oy6yirqz07mq7qew
try..except blocks that are compatible with Python 2 and Python 3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/databases/base.py
338
338
                connection2.execute("UPDATE test SET title='Title 100' "
339
339
                                    "WHERE id=10")
340
340
                connection2.commit()
341
 
            except OperationalError, e:
 
341
            except OperationalError as e:
342
342
                self.assertEquals(str(e), "database is locked") # SQLite blocks
343
343
            result = connection1.execute("SELECT title FROM test WHERE id=10")
344
344
            self.assertEquals(result.get_one(), ("Title 10",))
592
592
            cursor = self.connection._raw_connection.cursor()
593
593
            cursor.execute("SELECT 1")
594
594
            cursor.fetchone()
595
 
        except Error, exc:
 
595
        except Error as exc:
596
596
            self.assertTrue(self.connection.is_disconnection_error(exc))
597
597
        else:
598
598
            self.fail("Disconnection was not caught.")
601
601
        # error when called.
602
602
        try:
603
603
            self.connection._raw_connection.rollback()
604
 
        except Error, exc:
 
604
        except Error as exc:
605
605
            self.assertTrue(self.connection.is_disconnection_error(exc))
606
606
        else:
607
607
            self.fail("Disconnection was not raised.")
625
625
            cursor = self.connection._raw_connection.cursor()
626
626
            cursor.execute("SELECT 1")
627
627
            cursor.fetchone()
628
 
        except DatabaseError, exc:
 
628
        except DatabaseError as exc:
629
629
            self.assertTrue(self.connection.is_disconnection_error(exc))
630
630
        else:
631
631
            self.fail("Disconnection was not caught.")