summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2016-09-20 13:58:55 -0400
committerGerrit Code Review <gerrit2@ln3.zzzcomputing.com>2016-09-20 13:58:55 -0400
commit11d24b6614f660c19fad5ba224042bd5e0e7d3e3 (patch)
tree71de50f5f52281e2d88490a20dd9290e4f90b8d0 /lib/sqlalchemy
parent0c90cac2c37453a6688d9c1da62bbfb0bfa13d02 (diff)
parente95aa257aa3145a5db478d33fb1803494a38b46d (diff)
downloadsqlalchemy-11d24b6614f660c19fad5ba224042bd5e0e7d3e3.tar.gz
Merge "Add the "triggering mapper" to the configure_mappers error message."
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/mapper.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index e8aa08541..b8dc5b8c3 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -2833,8 +2833,9 @@ def configure_mappers():
e = sa_exc.InvalidRequestError(
"One or more mappers failed to initialize - "
"can't proceed with initialization of other "
- "mappers. Original exception was: %s"
- % mapper._configure_failed)
+ "mappers. Triggering mapper: '%s'. "
+ "Original exception was: %s"
+ % (mapper, mapper._configure_failed))
e._configure_failed = mapper._configure_failed
raise e
if not mapper.configured: