take out a little cruft. Spend two hours trying to make things simpler,

maybe we dont need state.callables (nope we do), maybe we can move populate_state out
(nope we lose speed that way), things are the way they are...

1 files changed, 1 insertions, 23 deletions

diff --git a/lib/sqlalchemy/orm/instrumentation.py b/lib/sqlalchemy/orm/instrumentation.py
index 7fe3335e0..f14b75253 100644
--- a/lib/sqlalchemy/orm/instrumentation.py
+++ b/lib/sqlalchemy/orm/instrumentation.py
@@ -110,6 +110,7 @@ class ClassManager(dict):
 
     @util.memoized_property
     def mapper(self):
+        # raises unless self.mapper has been assigned
         raise exc.UnmappedClassError(self.class_)
 
     def _attr_has_impl(self, key):
@@ -120,27 +121,6 @@ class ClassManager(dict):
 
         return key in self and self[key].impl is not None
 
-    def _configure_create_arguments(self, 
-                            _source=None, 
-                            deferred_scalar_loader=None):
-        """Accept extra **kw arguments passed to create_manager_for_cls.
-
-        The current contract of ClassManager and other managers is that they
-        take a single "cls" argument in their constructor (as per 
-        test/orm/instrumentation.py InstrumentationCollisionTest).  This
-        is to provide consistency with the current API of "class manager"
-        callables and such which may return various ClassManager and 
-        ClassManager-like instances.   So create_manager_for_cls sends
-        in ClassManager-specific arguments via this method once the 
-        non-proxied ClassManager is available.
-
-        """
-        if _source:
-            deferred_scalar_loader = _source.deferred_scalar_loader
-
-        if deferred_scalar_loader:
-            self.deferred_scalar_loader = deferred_scalar_loader
-
     def _subclass_manager(self, cls):
         """Create a new ClassManager for a subclass of this ClassManager's
         class.
@@ -526,8 +506,6 @@ class InstrumentationRegistry(object):
             self._extended = True
             _install_lookup_strategy(self)
 
-        manager._configure_create_arguments(**kw)
-
         manager.factory = factory
         self._manager_finders[class_] = manager.manager_getter()
         self._state_finders[class_] = manager.state_getter()