summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/mapper.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-10-11 20:08:27 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-10-11 20:08:27 -0400
commitf7b119705aef79e7e8957ae6eb654b9057cea45f (patch)
treedfe707eaf27538c82aa5504584941dc4b46ce933 /lib/sqlalchemy/orm/mapper.py
parent216b88894d95c17a1bd18b9d574e96530fb6f1cb (diff)
parent690532131d8ce8250c62f1d3e27405902df03e70 (diff)
downloadsqlalchemy-f7b119705aef79e7e8957ae6eb654b9057cea45f.tar.gz
Merge remote-tracking branch 'origin/pr/140' into pr140
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
-rw-r--r--lib/sqlalchemy/orm/mapper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 2ab239f86..7e88ba161 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -2654,7 +2654,7 @@ def configure_mappers():
mapper._expire_memoizations()
mapper.dispatch.mapper_configured(
mapper, mapper.class_)
- except:
+ except Exception:
exc = sys.exc_info()[1]
if not hasattr(exc, '_configure_failed'):
mapper._configure_failed = exc