7 files changed, 10 insertions, 31 deletions
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index e2ca39137..3b67f767b 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -16,7 +16,6 @@ from . import mapperlib, instrumentation
 from .session import Session, sessionmaker
 from .scoping import scoped_session
 from .attributes import QueryableAttribute
-from . import mapper as mapperfunc
 
 class InstrumentationEvents(event.Events):
     """Events related to class instrumentation events.
diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py
index d0234a1d3..4b6ba0aa3 100644
--- a/lib/sqlalchemy/orm/identity.py
+++ b/lib/sqlalchemy/orm/identity.py
@@ -172,7 +172,7 @@ class WeakInstanceDict(IdentityMap):
         if util.py2k:
             return dict.values(self)
         else:
-             return list(dict.values(self))
+            return list(dict.values(self))
 
     def discard(self, state):
         st = dict.get(self, state.key, None)
diff --git a/lib/sqlalchemy/orm/instrumentation.py b/lib/sqlalchemy/orm/instrumentation.py
index a86a6086d..e2782e610 100644
--- a/lib/sqlalchemy/orm/instrumentation.py
+++ b/lib/sqlalchemy/orm/instrumentation.py
@@ -30,7 +30,7 @@ alternate instrumentation forms.
 
 
 from . import exc, collections, interfaces, state
-from .. import event, util
+from .. import util
 from . import base
 
 class ClassManager(dict):
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 1c322d5b9..ace4c118e 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2414,10 +2414,10 @@ class Query(object):
         """
         return [
             {
-                'name':ent._label_name,
-                'type':ent.type,
-                'aliased':getattr(ent, 'is_aliased_class', False),
-                'expr':ent.expr
+                'name': ent._label_name,
+                'type': ent.type,
+                'aliased': getattr(ent, 'is_aliased_class', False),
+                'expr': ent.expr
             }
             for ent in self._entities
         ]
@@ -2937,10 +2937,8 @@ class _MapperEntity(_QueryEntity):
 
         return entity.common_parent(self.entity_zero)
 
-    #_adapted_selectable = None
     def adapt_to_selectable(self, query, sel):
         query._entities.append(self)
-    #    self._adapted_selectable = sel
 
     def _get_entity_clauses(self, query, context):
 
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 857ef0666..217686268 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -8,7 +8,7 @@
 
 
 import weakref
-from .. import util, sql, engine, exc as sa_exc, event
+from .. import util, sql, engine, exc as sa_exc
 from ..sql import util as sql_util, expression
 from . import (
     SessionExtension, attributes, exc, query,
@@ -21,7 +21,6 @@ from .base import (
     _none_set, state_str, instance_str
     )
 from .unitofwork import UOWTransaction
-#from .events import SessionEvents
 from . import state as statelib
 import sys
 
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index fb63de807..63b7d7c0b 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -941,7 +941,7 @@ class SubqueryLoader(AbstractRelationshipLoader):
         collections = path.get(context.attributes, "collections")
         if collections is None:
             collections = dict(
-                    (k, [v[0] for v in v])
+                    (k, [vv[0] for vv in v])
                     for k, v in itertools.groupby(
                         subq,
                         lambda x: x[1:]
@@ -1353,27 +1353,11 @@ class EagerLazyOption(StrategizedOption):
         self.lazy = lazy
         self.chained = chained
         self.propagate_to_loaders = propagate_to_loaders
-        #self.strategy_cls = properties.RelationshipProperty._strategy_lookup(lazy=lazy)
-        self.strategy_cls = factory(lazy)
+        self.strategy_cls = properties.RelationshipProperty._strategy_lookup(lazy=lazy)
 
     def get_strategy_class(self):
         return self.strategy_cls
 
-_factory = {
-    False: JoinedLoader,
-    "joined": JoinedLoader,
-    None: NoLoader,
-    "noload": NoLoader,
-    "select": LazyLoader,
-    True: LazyLoader,
-    "subquery": SubqueryLoader,
-    "immediate": ImmediateLoader
-}
-
-
-def factory(identifier):
-    return _factory.get(identifier, LazyLoader)
-
 
 class EagerJoinOption(PropertyOption):
 
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index d10a78dd7..d88164e7d 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -15,6 +15,7 @@ from .base import instance_str, state_str, state_class_str, attribute_str, \
         state_attribute_str, object_mapper, object_state, _none_set
 from .base import class_mapper, _class_to_mapper
 from .base import _InspectionAttr
+from .path_registry import PathRegistry
 
 all_cascades = frozenset(("delete", "delete-orphan", "all", "merge",
                           "expunge", "save-update", "refresh-expire",
@@ -243,8 +244,6 @@ class ORMAdapter(sql_util.ColumnAdapter):
         else:
             return None
 
-from .path_registry import _unreduce_path, PathRegistry, RootRegistry, TokenRegistry, PropRegistry, EntityRegistry
-
 class AliasedClass(object):
     """Represents an "aliased" form of a mapped class for usage with Query.