- Moved to 2.4+ import syntax (w/ some experimental merge-friendly formatting)

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index aa79e610f..e16a6dba4 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -6,10 +6,12 @@
 
 import sqlalchemy.exceptions as sa_exc
 from sqlalchemy.util import ScopedRegistry, to_list, get_cls_kwargs
-from sqlalchemy.orm import MapperExtension, EXT_CONTINUE, object_session, \
-     class_mapper
+from sqlalchemy.orm import (
+    EXT_CONTINUE, MapperExtension, class_mapper, object_session,
+    )
 from sqlalchemy.orm.session import Session
 
+
 __all__ = ['ScopedSession']