diff options
| author | ndparker <ndparker@users.noreply.github.com> | 2014-10-02 22:00:31 +0200 |
|---|---|---|
| committer | ndparker <ndparker@users.noreply.github.com> | 2014-10-02 22:00:31 +0200 |
| commit | 690532131d8ce8250c62f1d3e27405902df03e70 (patch) | |
| tree | 69ef40646aa14519b539ae9d09a16229b7b3e20a /lib/sqlalchemy/orm/mapper.py | |
| parent | ce52dd9e3b71f2074d7821fe62803d4e0eefe512 (diff) | |
| download | sqlalchemy-pr/140.tar.gz | |
cleanup exception handling - use new exception hierarchy (since python 2.5)pr/140
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index bd28975dd..e4c0de188 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -2649,9 +2649,7 @@ def configure_mappers(): mapper._expire_memoizations() mapper.dispatch.mapper_configured( mapper, mapper.class_) - except (SystemExit, KeyboardInterrupt): - raise - except: + except Exception: exc = sys.exc_info()[1] if not hasattr(exc, '_configure_failed'): mapper._configure_failed = exc |