`from foo import (name, name)` isn't valid syntax for 2.3. ah well.

omitting modules from sqlalchemy.__all__...

12 files changed, 18 insertions, 11 deletions

diff --git a/test/orm/cascade.py b/test/orm/cascade.py
index b832c427e..d703642b7 100644
--- a/test/orm/cascade.py
+++ b/test/orm/cascade.py
@@ -1,6 +1,7 @@
 import testbase
 
 from sqlalchemy import *
+from sqlalchemy import exceptions
 from sqlalchemy.orm import *
 from sqlalchemy.ext.sessioncontext import SessionContext
 from testlib import *
diff --git a/test/orm/compile.py b/test/orm/compile.py
index 23f04db85..efbe2d4c6 100644
--- a/test/orm/compile.py
+++ b/test/orm/compile.py
@@ -1,5 +1,6 @@
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions
 from sqlalchemy.orm import *
 from testlib import *
 
diff --git a/test/orm/inheritance/basic.py b/test/orm/inheritance/basic.py
index be623e1b8..ae709b7c5 100644
--- a/test/orm/inheritance/basic.py
+++ b/test/orm/inheritance/basic.py
@@ -1,5 +1,6 @@
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions, util
 from sqlalchemy.orm import *
 from testlib import *
 
diff --git a/test/orm/inheritance/polymorph2.py b/test/orm/inheritance/polymorph2.py
index 8ed4b806a..6e03c97e9 100644
--- a/test/orm/inheritance/polymorph2.py
+++ b/test/orm/inheritance/polymorph2.py
@@ -1,5 +1,6 @@
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions, util
 from sqlalchemy.orm import *
 from testlib import *
 
diff --git a/test/orm/lazy_relations.py b/test/orm/lazy_relations.py
index e4a9c0c19..6cea2a4bc 100644
--- a/test/orm/lazy_relations.py
+++ b/test/orm/lazy_relations.py
@@ -2,6 +2,7 @@
 
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions
 from sqlalchemy.orm import *
 from testlib import *
 from testlib.fixtures import *
diff --git a/test/orm/mapper.py b/test/orm/mapper.py
index 526c575c3..905ad5bfe 100644
--- a/test/orm/mapper.py
+++ b/test/orm/mapper.py
@@ -2,8 +2,8 @@
 
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions, sql
 from sqlalchemy.orm import *
-import sqlalchemy.exceptions as exceptions
 from sqlalchemy.ext.sessioncontext import SessionContext, SessionContextExt
 from testlib import *
 from testlib.tables import *
diff --git a/test/orm/query.py b/test/orm/query.py
index e3f6ed42c..c7847b321 100644
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -1,7 +1,8 @@
 import testbase
 import operator
-from sqlalchemy.sql import compiler
 from sqlalchemy import *
+from sqlalchemy import exceptions
+from sqlalchemy.sql import compiler
 from sqlalchemy.engine import default
 from sqlalchemy.orm import *
 from testlib import *
diff --git a/test/orm/relationships.py b/test/orm/relationships.py
index e628b20b5..d21121e18 100644
--- a/test/orm/relationships.py
+++ b/test/orm/relationships.py
@@ -1,7 +1,7 @@
 import testbase
 import datetime
 from sqlalchemy import *
-from sqlalchemy import types
+from sqlalchemy import exceptions, types
 from sqlalchemy.orm import *
 from sqlalchemy.orm import collections
 from sqlalchemy.orm.collections import collection
diff --git a/test/orm/selectable.py b/test/orm/selectable.py
index 7f2fe0b6d..3478bc922 100644
--- a/test/orm/selectable.py
+++ b/test/orm/selectable.py
@@ -2,6 +2,7 @@
 
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions
 from sqlalchemy.orm import *
 from testlib import *
 from testlib.fixtures import *
@@ -46,4 +47,4 @@ class SelectableNoFromsTest(ORMTest):
     # TODO: more tests mapping to selects
     
 if __name__ == '__main__':
-    testbase.main()
\ No newline at end of file
+    testbase.main()
diff --git a/test/orm/session.py b/test/orm/session.py
index c4fa10f0a..8c93eacbc 100644
--- a/test/orm/session.py
+++ b/test/orm/session.py
@@ -1,11 +1,11 @@
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions
 from sqlalchemy.orm import *
 from sqlalchemy.orm.session import Session as SessionCls
 from testlib import *
 from testlib.tables import *
-import testlib.tables as tables
-from testlib import fixtures
+from testlib import fixtures, tables
 
 class SessionTest(AssertMixin):
     def setUpAll(self):
diff --git a/test/orm/sharding/shard.py b/test/orm/sharding/shard.py
index d4b4c249a..e82de73ea 100644
--- a/test/orm/sharding/shard.py
+++ b/test/orm/sharding/shard.py
@@ -1,10 +1,10 @@
 import testbase
+import datetime, os
 from sqlalchemy import *
+from sqlalchemy import exceptions, sql
 from sqlalchemy.orm import *
-
 from sqlalchemy.orm.shard import ShardedSession
 from sqlalchemy.sql import operators
-import datetime, os
 from testlib import PersistTest
 
 # TODO: ShardTest can be turned into a base for further subclasses
@@ -158,4 +158,4 @@ class ShardTest(PersistTest):
 
 if __name__ == '__main__':
     testbase.main()
-    
\ No newline at end of file
+    
diff --git a/test/orm/unitofwork.py b/test/orm/unitofwork.py
index d689f1703..1247a6c7f 100644
--- a/test/orm/unitofwork.py
+++ b/test/orm/unitofwork.py
@@ -2,11 +2,11 @@
 import testbase
 import pickleable
 from sqlalchemy import *
+from sqlalchemy import exceptions, sql
 from sqlalchemy.orm import *
 from testlib import *
 from testlib.tables import *
-from testlib import tables
-from testlib import fixtures
+from testlib import tables, fixtures
 
 """tests unitofwork operations"""