summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/exceptions.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/exceptions.py')
-rw-r--r--lib/sqlalchemy/exceptions.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/sqlalchemy/exceptions.py b/lib/sqlalchemy/exceptions.py
index 9c7caedd0..decde0efa 100644
--- a/lib/sqlalchemy/exceptions.py
+++ b/lib/sqlalchemy/exceptions.py
@@ -96,8 +96,14 @@ class DBAPIError(SQLAlchemyError):
instance = classmethod(instance)
def __init__(self, statement, params, orig):
- SQLAlchemyError.__init__(self, "(%s) %s" %
- (orig.__class__.__name__, str(orig)))
+ try:
+ text = str(orig)
+ except (KeyboardInterrupt, SystemExit):
+ raise
+ except Exception, e:
+ text = 'Error in str() of DB-API-generated exception: ' + str(e)
+ SQLAlchemyError.__init__(
+ self, "(%s) %s" % (orig.__class__.__name__, text))
self.statement = statement
self.params = params
self.orig = orig