diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-10-11 20:08:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-10-11 20:08:27 -0400 |
| commit | f7b119705aef79e7e8957ae6eb654b9057cea45f (patch) | |
| tree | dfe707eaf27538c82aa5504584941dc4b46ce933 /lib/sqlalchemy/exc.py | |
| parent | 216b88894d95c17a1bd18b9d574e96530fb6f1cb (diff) | |
| parent | 690532131d8ce8250c62f1d3e27405902df03e70 (diff) | |
| download | sqlalchemy-f7b119705aef79e7e8957ae6eb654b9057cea45f.tar.gz | |
Merge remote-tracking branch 'origin/pr/140' into pr140
Diffstat (limited to 'lib/sqlalchemy/exc.py')
| -rw-r--r-- | lib/sqlalchemy/exc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py index a82bae33f..5d35dc2e7 100644 --- a/lib/sqlalchemy/exc.py +++ b/lib/sqlalchemy/exc.py @@ -280,7 +280,9 @@ class DBAPIError(StatementError): connection_invalidated=False): # Don't ever wrap these, just return them directly as if # DBAPIError didn't exist. - if isinstance(orig, (KeyboardInterrupt, SystemExit, DontWrapMixin)): + if (isinstance(orig, BaseException) and + not isinstance(orig, Exception)) or \ + isinstance(orig, DontWrapMixin): return orig if orig is not None: @@ -310,8 +312,6 @@ class DBAPIError(StatementError): def __init__(self, statement, params, orig, connection_invalidated=False): try: text = str(orig) - except (KeyboardInterrupt, SystemExit): - raise except Exception as e: text = 'Error in str() of DB-API-generated exception: ' + str(e) StatementError.__init__( |