Merge branch 'master' of bitbucket.org:zzzeek/sqlalchemy

1 files changed, 69 insertions, 45 deletions

diff --git a/test/base/test_except.py b/test/base/test_except.py
index 359473c54..918e7a042 100644
--- a/test/base/test_except.py
+++ b/test/base/test_except.py
@@ -19,6 +19,7 @@ class OperationalError(DatabaseError):
 
 
 class ProgrammingError(DatabaseError):
+
     def __str__(self):
         return '<%s>' % self.bogus
 
@@ -31,89 +32,110 @@ class WrapTest(fixtures.TestBase):
 
     def test_db_error_normal(self):
         try:
-            raise sa_exceptions.DBAPIError.instance('', [],
-                    OperationalError(), DatabaseError)
+            raise sa_exceptions.DBAPIError.instance(
+                '', [],
+                OperationalError(), DatabaseError)
         except sa_exceptions.DBAPIError:
             self.assert_(True)
 
     def test_tostring(self):
         try:
-            raise sa_exceptions.DBAPIError.instance('this is a message'
-                    , None, OperationalError(), DatabaseError)
+            raise sa_exceptions.DBAPIError.instance(
+                'this is a message',
+                None, OperationalError(), DatabaseError)
         except sa_exceptions.DBAPIError as exc:
-            assert str(exc) \
-                == "(OperationalError)  'this is a message' None"
+            eq_(
+                str(exc),
+                "(test.base.test_except.OperationalError)  "
+                "[SQL: 'this is a message']")
 
     def test_tostring_large_dict(self):
         try:
-            raise sa_exceptions.DBAPIError.instance('this is a message'
-                    ,
-                {'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5, 'f': 6, 'g': 7, 'h':
-                8, 'i': 9, 'j': 10, 'k': 11,
-                }, OperationalError(), DatabaseError)
+            raise sa_exceptions.DBAPIError.instance(
+                'this is a message',
+                {
+                    'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5, 'f': 6, 'g': 7,
+                    'h': 8, 'i': 9, 'j': 10, 'k': 11
+                },
+                OperationalError(), DatabaseError)
         except sa_exceptions.DBAPIError as exc:
-            assert str(exc).startswith("(OperationalError)  'this is a "
-                    "message' {")
+            assert str(exc).startswith(
+                "(test.base.test_except.OperationalError)  "
+                "[SQL: 'this is a message'] [parameters: {")
 
     def test_tostring_large_list(self):
         try:
-            raise sa_exceptions.DBAPIError.instance('this is a message',
-                [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,],
+            raise sa_exceptions.DBAPIError.instance(
+                'this is a message',
+                [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
                 OperationalError(), DatabaseError)
         except sa_exceptions.DBAPIError as exc:
-            assert str(exc).startswith("(OperationalError)  'this is a "
-                    "message' [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]")
+            assert str(exc).startswith(
+                "(test.base.test_except.OperationalError)  "
+                "[SQL: 'this is a message'] [parameters: "
+                "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]]")
 
     def test_tostring_large_executemany(self):
         try:
-            raise sa_exceptions.DBAPIError.instance('this is a message',
+            raise sa_exceptions.DBAPIError.instance(
+                'this is a message',
                 [{1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1},
-                {1: 1}, {1:1}, {1: 1}, {1: 1},],
+                 {1: 1}, {1: 1}, {1: 1}, {1: 1}, ],
                 OperationalError(), DatabaseError)
         except sa_exceptions.DBAPIError as exc:
-            eq_(str(exc) ,
-                "(OperationalError)  'this is a message' [{1: 1}, "\
-                "{1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: "\
-                "1}, {1: 1}, {1: 1}]")
+            eq_(
+                str(exc),
+                "(test.base.test_except.OperationalError)  "
+                "[SQL: 'this is a message'] [parameters: [{1: 1}, "
+                "{1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: "
+                "1}, {1: 1}, {1: 1}]]"
+            )
         try:
             raise sa_exceptions.DBAPIError.instance('this is a message', [
                 {1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1},
-                {1:1}, {1: 1}, {1: 1}, {1: 1},
-                ], OperationalError(), DatabaseError)
+                {1: 1}, {1: 1}, {1: 1}, {1: 1},
+            ], OperationalError(), DatabaseError)
         except sa_exceptions.DBAPIError as exc:
-            eq_(str(exc) ,
-                "(OperationalError)  'this is a message' [{1: 1}, "
+            eq_(str(exc),
+                "(test.base.test_except.OperationalError)  "
+                "[SQL: 'this is a message'] [parameters: [{1: 1}, "
                 "{1: 1}, {1: 1}, {1: 1}, {1: 1}, {1: 1}, "
                 "{1: 1}, {1: 1}  ... displaying 10 of 11 total "
-                "bound parameter sets ...  {1: 1}, {1: 1}]"
-            )
+                "bound parameter sets ...  {1: 1}, {1: 1}]]"
+                )
         try:
-            raise sa_exceptions.DBAPIError.instance('this is a message',
+            raise sa_exceptions.DBAPIError.instance(
+                'this is a message',
                 [
-                (1, ), (1, ), (1, ), (1, ), (1, ), (1, ), (1, ), (1, ), (1, ),
-                (1, ),
+                    (1, ), (1, ), (1, ), (1, ), (1, ), (1, ),
+                    (1, ), (1, ), (1, ), (1, ),
                 ], OperationalError(), DatabaseError)
+
         except sa_exceptions.DBAPIError as exc:
-            eq_(str(exc),
-                "(OperationalError)  'this is a message' [(1,), "\
-                "(1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,)]")
+            eq_(
+                str(exc),
+                "(test.base.test_except.OperationalError)  "
+                "[SQL: 'this is a message'] [parameters: [(1,), "
+                "(1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,)]]")
         try:
             raise sa_exceptions.DBAPIError.instance('this is a message', [
                 (1, ), (1, ), (1, ), (1, ), (1, ), (1, ), (1, ), (1, ), (1, ),
                 (1, ), (1, ),
-                ], OperationalError(), DatabaseError)
+            ], OperationalError(), DatabaseError)
         except sa_exceptions.DBAPIError as exc:
             eq_(str(exc),
-                "(OperationalError)  'this is a message' [(1,), "
+                "(test.base.test_except.OperationalError)  "
+                "[SQL: 'this is a message'] [parameters: [(1,), "
                 "(1,), (1,), (1,), (1,), (1,), (1,), (1,)  "
                 "... displaying 10 of 11 total bound "
-                "parameter sets ...  (1,), (1,)]"
-            )
+                "parameter sets ...  (1,), (1,)]]"
+                )
 
     def test_db_error_busted_dbapi(self):
         try:
-            raise sa_exceptions.DBAPIError.instance('', [],
-                    ProgrammingError(), DatabaseError)
+            raise sa_exceptions.DBAPIError.instance(
+                '', [],
+                ProgrammingError(), DatabaseError)
         except sa_exceptions.DBAPIError as e:
             self.assert_(True)
             self.assert_('Error in str() of DB-API' in e.args[0])
@@ -140,8 +162,9 @@ class WrapTest(fixtures.TestBase):
 
     def test_db_error_keyboard_interrupt(self):
         try:
-            raise sa_exceptions.DBAPIError.instance('', [],
-                    KeyboardInterrupt(), DatabaseError)
+            raise sa_exceptions.DBAPIError.instance(
+                '', [],
+                KeyboardInterrupt(), DatabaseError)
         except sa_exceptions.DBAPIError:
             self.assert_(False)
         except KeyboardInterrupt:
@@ -149,8 +172,9 @@ class WrapTest(fixtures.TestBase):
 
     def test_db_error_system_exit(self):
         try:
-            raise sa_exceptions.DBAPIError.instance('', [],
-                    SystemExit(), DatabaseError)
+            raise sa_exceptions.DBAPIError.instance(
+                '', [],
+                SystemExit(), DatabaseError)
         except sa_exceptions.DBAPIError:
             self.assert_(False)
         except SystemExit: