- roll back part of pr 140 to get exception wrapping working again

diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py
index 5d35dc2e7a6c51e0288374d657753503252d0941..8e65ef07b2bb5cf120943875eaee7972cd4c4f46 100644 (file)
--- a/lib/sqlalchemy/exc.py
+++ b/lib/sqlalchemy/exc.py
@@ -280,9 +280,13 @@ class DBAPIError(StatementError):
                  connection_invalidated=False):
         # Don't ever wrap these, just return them directly as if
         # DBAPIError didn't exist.
-        if (isinstance(orig, BaseException) and
-                not isinstance(orig, Exception)) or \
-                isinstance(orig, DontWrapMixin):
+        if isinstance(orig, (KeyboardInterrupt, SystemExit, DontWrapMixin)):
+
+        # TODO: shouldn't it work this way?  see if we can get this
+        # to work in py3k
+        #if (isinstance(orig, BaseException) and
+        #        not isinstance(orig, Exception)) or \
+        #        isinstance(orig, DontWrapMixin):
             return orig
 
         if orig is not None: