2 files changed, 7 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 5a2c41449..222bd75fb 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -10,28 +10,30 @@ the schema and sql packages and tying operations to class properties and
 constructors.
 """
 
-from sqlalchemy import exceptions
 from sqlalchemy import util as sautil
 from sqlalchemy.orm.mapper import Mapper, object_mapper, class_mapper, mapper_registry
 from sqlalchemy.orm.interfaces import SynonymProperty, MapperExtension, EXT_CONTINUE, EXT_STOP, EXT_PASS, ExtensionOption, PropComparator
 from sqlalchemy.orm.properties import PropertyLoader, ColumnProperty, CompositeProperty, BackRef
 from sqlalchemy.orm import mapper as mapperlib
-from sqlalchemy.orm import collections, strategies
+from sqlalchemy.orm import strategies
 from sqlalchemy.orm.query import Query
 from sqlalchemy.orm.util import polymorphic_union
 from sqlalchemy.orm.session import Session as _Session
 from sqlalchemy.orm.session import object_session, attribute_manager, sessionmaker
 from sqlalchemy.orm.scoping import ScopedSession
 
+
 __all__ = [ 'relation', 'column_property', 'composite', 'backref', 'eagerload',
             'eagerload_all', 'lazyload', 'noload', 'deferred', 'defer',
             'undefer', 'undefer_group', 'extension', 'mapper', 'clear_mappers',
             'compile_mappers', 'class_mapper', 'object_mapper', 'sessionmaker',
-            'scoped_session', 'dynamic_loader', 'MapperExtension', 'polymorphic_union',
+            'scoped_session', 'dynamic_loader', 'MapperExtension',
+            'polymorphic_union',
             'create_session', 'synonym', 'contains_alias', 'Query',
             'contains_eager', 'EXT_CONTINUE', 'EXT_STOP', 'EXT_PASS',
             'object_session', 'PropComparator' ]
 
+
 def scoped_session(session_factory, scopefunc=None):
   """Provides thread-local management of Sessions.
   
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 511e4a326..714b00376 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -7,9 +7,9 @@
 import weakref, threading
 import UserDict
 from sqlalchemy import util
-from sqlalchemy.orm import util as orm_util, interfaces, collections
+from sqlalchemy.orm import interfaces, collections
 from sqlalchemy.orm.mapper import class_mapper
-from sqlalchemy import logging, exceptions
+from sqlalchemy import exceptions
 
 
 PASSIVE_NORESULT = object()