- spot checking of imports, obsolete functions

diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index e2ca39137961301f658f3efde1fac0eb49449959..3b67f767bbc4096e1a276eba26675ede6e449ff2 100644 (file)
--- 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 d0234a1d382417ca730ebbddc2b91e738796ad9e..4b6ba0aa3e03c2e6ecf88ad590f7cedd615eda55 100644 (file)
--- 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 a86a6086d3aca4ebbb62de6ebe16fc6246d46604..e2782e610efbaf4d950fd3c51f15ed90403bb4ba 100644 (file)
--- 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 1c322d5b9b3bfc1d522b6ab2685099e45bbd13bd..ace4c118e29c98498fb29508e46bfab9e8e137d7 100644 (file)
--- 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 857ef066681c2f331f3ea682019756df81684202..21768626876478dfe6bd6d05b9c20b943ff159f3 100644 (file)
--- 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 fb63de807ed3ba5b940cbfc66a690752bc9d09ba..63b7d7c0bbb4e77a11a57e2233e09f753d86be04 100644 (file)
--- 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 d10a78dd78c9e69b532887de9e68be29d4c5c4eb..d88164e7d35322b8ce0530608e34aba28b4b37bc 100644 (file)
--- 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.
 

diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index 86a90828ae91f4d8157555df66d40dc44be65849..c3b44abae750d90cc13262eaa69067ebd0e0fbf9 100644 (file)
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -6,7 +6,6 @@
 
 """Collection classes and helpers."""
 
-import itertools
 import weakref
 import operator
 from .compat import threading, itertools_filterfalse

diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index 1fd5ccf30d44f038df9102da4e6e2a3ee3536914..8cf3db1bb061b2cb0b38a83914fdf2152d50b8d5 100644 (file)
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -166,7 +166,6 @@ class PluginLoader(object):
                 self.impls[name] = impl.load
                 return impl.load()
 
-        from sqlalchemy import exc
         raise exc.ArgumentError(
                 "Can't load plugin: %s:%s" %
                 (self.group, name))
@@ -219,6 +218,7 @@ def get_cls_kwargs(cls, _set=None):
 
 
 try:
+    # TODO: who doesn't have this constant?
     from inspect import CO_VARKEYWORDS
 
     def inspect_func_args(fn):

diff --git a/test/orm/test_utils.py b/test/orm/test_utils.py
index d15881075257d7d54fa0ab6e52967d9d9c2a1bec..96878424fc524f8b6cf2a16ae2749669cca01735 100644 (file)
--- a/test/orm/test_utils.py
+++ b/test/orm/test_utils.py
@@ -10,7 +10,7 @@ from sqlalchemy.orm import mapper, create_session
 from sqlalchemy.testing import fixtures
 from test.orm import _fixtures
 from sqlalchemy.testing import eq_, is_
-from sqlalchemy.orm.util import PathRegistry
+from sqlalchemy.orm.path_registry import PathRegistry, RootRegistry
 from sqlalchemy import inspect
 
 class AliasedClassTest(fixtures.TestBase):
@@ -241,12 +241,12 @@ class PathRegistryTest(_fixtures.FixtureTest):
     def test_root_registry(self):
         umapper = inspect(self.classes.User)
         is_(
-            orm_util.RootRegistry()[umapper],
+            RootRegistry()[umapper],
             umapper._path_registry
         )
         eq_(
-            orm_util.RootRegistry()[umapper],
-            orm_util.PathRegistry.coerce((umapper,))
+            RootRegistry()[umapper],
+            PathRegistry.coerce((umapper,))
         )
 
     def test_expand(self):