revert this, the instrumentation here is conditional

diff --git a/doc/build/core/types.rst b/doc/build/core/types.rst
index 064489c9fd4283142e0b572c35dbe9c1b1998335..b6144a4384077c907676f0b5e3c10b040d593fa4 100644 (file)
--- a/doc/build/core/types.rst
+++ b/doc/build/core/types.rst
@@ -284,7 +284,7 @@ Augmenting Existing Types
 
 The :class:`.TypeDecorator` allows the creation of custom types which
 add bind-parameter and result-processing behavior to an existing
-type object.  It is used when additional in-Python marshalling of data
+type object.  It is used when additional in-Python marshaling of data
 to and from the database is required.
 
 .. autoclass:: TypeDecorator

diff --git a/lib/sqlalchemy/sql/visitors.py b/lib/sqlalchemy/sql/visitors.py
index 59ad2907706007575a3a1f3a679269d277258040..5354fbcbb444a734b528180030172f62dde6d308 100644 (file)
--- a/lib/sqlalchemy/sql/visitors.py
+++ b/lib/sqlalchemy/sql/visitors.py
@@ -52,7 +52,7 @@ class VisitableType(type):
             super(VisitableType, cls).__init__(clsname, bases, clsdict)
             return
 
-        cls._compiler_dispatch = _generate_dispatch(cls)
+        _generate_dispatch(cls)
 
         super(VisitableType, cls).__init__(clsname, bases, clsdict)
 
@@ -81,7 +81,7 @@ def _generate_dispatch(cls):
           """Look for an attribute named "visit_" + self.__visit_name__
             on the visitor, and call it with the same kw params.
             """
-        return _compiler_dispatch
+        cls._compiler_dispatch = _compiler_dispatch
 
 class Visitable(object):
     """Base class for visitable objects, applies the