diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2016-09-19 18:15:02 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ln3.zzzcomputing.com> | 2016-09-19 18:15:02 -0400 |
| commit | e49292894a7b5a372d0e930691d65002ae1537c6 (patch) | |
| tree | 64c67f5e5f2713dbe999bb9a3b08346ba5115e06 /lib/sqlalchemy | |
| parent | dc7aef1d70519e8373da12d7760267854cd1fcc4 (diff) | |
| parent | 7ea54611516147a1af917691c60e1823b77c7ecf (diff) | |
| download | sqlalchemy-e49292894a7b5a372d0e930691d65002ae1537c6.tar.gz | |
Merge "Fix ArgumentError access in Session._add_bind"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index a7440bf40..d4f1c59d8 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -1122,9 +1122,8 @@ class Session(_SessionClassMethods): insp = inspect(key) except sa_exc.NoInspectionAvailable: if not isinstance(key, type): - raise exc.ArgumentError( - "Not acceptable bind target: %s" % - key) + raise sa_exc.ArgumentError( + "Not an acceptable bind target: %s" % key) else: self.__binds[key] = bind else: @@ -1135,9 +1134,8 @@ class Session(_SessionClassMethods): for selectable in insp._all_tables: self.__binds[selectable] = bind else: - raise exc.ArgumentError( - "Not acceptable bind target: %s" % - key) + raise sa_exc.ArgumentError( + "Not an acceptable bind target: %s" % key) def bind_mapper(self, mapper, bind): """Associate a :class:`.Mapper` with a "bind", e.g. a :class:`.Engine` |