- repair the inspection hook in sqltypes to not be fooled

by mock and other __getattr__ impostors

2 files changed, 8 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index 3cbeed0b4..6c9f07bff 100644
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -14,6 +14,7 @@ defines a large part of the ORM's interactivity.
 
 import weakref
 from .. import util
+from .. import inspection
 from . import exc as orm_exc, interfaces
 from .path_registry import PathRegistry
 from .base import PASSIVE_NO_RESULT, SQL_OK, NEVER_SET, ATTR_WAS_SET, \
@@ -21,6 +22,7 @@ from .base import PASSIVE_NO_RESULT, SQL_OK, NEVER_SET, ATTR_WAS_SET, \
 from . import base
 
 
+@inspection._self_inspects
 class InstanceState(interfaces.InspectionAttr):
     """tracks state information at the instance level.
 
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