diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-08-22 16:01:23 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-08-22 16:01:23 -0400 |
commit | 03e47a8255476d9ed50c5aec73e6c272761d67eb (patch) | |
tree | 14a66e0932e21bc011bf642fe55436e60e418743 /lib/sqlalchemy/sql | |
parent | 8712ef2f81498fe59b9636ba150833d779e60781 (diff) | |
download | sqlalchemy-03e47a8255476d9ed50c5aec73e6c272761d67eb.tar.gz |
- repair the inspection hook in sqltypes to not be fooled
by mock and other __getattr__ impostors
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r-- | lib/sqlalchemy/sql/sqltypes.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py index b5c575143..92a0628da 100644 --- a/lib/sqlalchemy/sql/sqltypes.py +++ b/lib/sqlalchemy/sql/sqltypes.py @@ -1745,7 +1745,12 @@ def _resolve_value_to_type(value): # use inspect() to detect SQLAlchemy built-in # objects. insp = inspection.inspect(value, False) - if insp is not None: + if ( + insp is not None and + # foil mock.Mock() and other impostors by ensuring + # the inspection target itself self-inspects + insp.__class__ in inspection._registrars + ): raise exc.ArgumentError( "Object %r is not legal as a SQL literal value" % value) return NULLTYPE |