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

omitting modules from sqlalchemy.__all__...

25 files changed, 54 insertions, 36 deletions

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 601d36b7b..b4587ee04 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -4,28 +4,31 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from sqlalchemy.types import (
-    BLOB, BOOLEAN, CHAR, CLOB, DATE, DATETIME, DECIMAL, FLOAT, INT,
-    NCHAR, SMALLINT, TEXT, TIME, TIMESTAMP, VARCHAR,
-    Binary, Boolean, Date, DateTime, Float, Integer, Interval, Numeric,
+import inspect
+from sqlalchemy.types import \
+    BLOB, BOOLEAN, CHAR, CLOB, DATE, DATETIME, DECIMAL, FLOAT, INT, \
+    NCHAR, SMALLINT, TEXT, TIME, TIMESTAMP, VARCHAR, \
+    Binary, Boolean, Date, DateTime, Float, Integer, Interval, Numeric, \
     PickleType, SmallInteger, String, Time, Unicode
-    )
-from sqlalchemy.sql import (
-    func, modifier, text, literal, literal_column, null, alias,
-    and_, or_, not_,
-    select, subquery, union, union_all, insert, update, delete,
-    join, outerjoin, 
-    bindparam, outparam, asc, desc,
-    except_, except_all, exists, intersect, intersect_all,
-    between, case, cast, distinct, extract, 
-    )
-from sqlalchemy.schema import (
-    MetaData, ThreadLocalMetaData, Table, Column, ForeignKey,
-    Sequence, Index, ForeignKeyConstraint, PrimaryKeyConstraint,
-    CheckConstraint, UniqueConstraint, Constraint, 
+
+from sqlalchemy.sql import \
+    func, modifier, text, literal, literal_column, null, alias, \
+    and_, or_, not_, \
+    select, subquery, union, union_all, insert, update, delete, \
+    join, outerjoin, \
+    bindparam, outparam, asc, desc, \
+    except_, except_all, exists, intersect, intersect_all, \
+    between, case, cast, distinct, extract
+
+from sqlalchemy.schema import \
+    MetaData, ThreadLocalMetaData, Table, Column, ForeignKey, \
+    Sequence, Index, ForeignKeyConstraint, PrimaryKeyConstraint, \
+    CheckConstraint, UniqueConstraint, Constraint, \
     PassiveDefault, ColumnDefault
-    )
+
 from sqlalchemy.engine import create_engine, engine_from_config
 
+__all__ = [ name for name, obj in locals().items()
+            if not (name.startswith('_') or inspect.ismodule(obj)) ]
 
 __version__ = 'svn'
diff --git a/lib/sqlalchemy/ext/sqlsoup.py b/lib/sqlalchemy/ext/sqlsoup.py
index 698391b96..2b8be3ad1 100644
--- a/lib/sqlalchemy/ext/sqlsoup.py
+++ b/lib/sqlalchemy/ext/sqlsoup.py
@@ -291,6 +291,7 @@ Boring tests here.  Nothing of real expository value.
 """
 
 from sqlalchemy import *
+from sqlalchemy import schema, sql
 from sqlalchemy.orm import *
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.exceptions import *
diff --git a/test/engine/bind.py b/test/engine/bind.py
index 2d96683b9..863260008 100644
--- a/test/engine/bind.py
+++ b/test/engine/bind.py
@@ -3,6 +3,7 @@ including the deprecated versions of these arguments"""
 
 import testbase
 from sqlalchemy import *
+from sqlalchemy import engine, exceptions
 from testlib import *
 
 
diff --git a/test/engine/metadata.py b/test/engine/metadata.py
index 03293b178..609c8deae 100644
--- a/test/engine/metadata.py
+++ b/test/engine/metadata.py
@@ -1,5 +1,6 @@
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions
 from testlib import *
 
 class MetaDataTest(PersistTest):
diff --git a/test/engine/parseconnect.py b/test/engine/parseconnect.py
index 14def8d3b..035a8d9cf 100644
--- a/test/engine/parseconnect.py
+++ b/test/engine/parseconnect.py
@@ -1,5 +1,6 @@
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions, pool
 import sqlalchemy.engine.url as url
 from testlib import *
 
diff --git a/test/engine/reflection.py b/test/engine/reflection.py
index 2345a328a..3bb188622 100644
--- a/test/engine/reflection.py
+++ b/test/engine/reflection.py
@@ -2,7 +2,7 @@ import testbase
 import pickle, StringIO, unicodedata
 
 from sqlalchemy import *
-from sqlalchemy.exceptions import NoSuchTableError
+from sqlalchemy import exceptions
 from testlib import *
 from testlib import engines
 
@@ -420,7 +420,7 @@ class ReflectionTest(PersistTest):
             meta.drop_all(testbase.db)
             
     def test_nonexistent(self):
-        self.assertRaises(NoSuchTableError, Table,
+        self.assertRaises(exceptions.NoSuchTableError, Table,
                           'fake_table',
                           MetaData(testbase.db), autoload=True)
         
diff --git a/test/ext/assignmapper.py b/test/ext/assignmapper.py
index 31b3dd576..e4c6123fd 100644
--- a/test/ext/assignmapper.py
+++ b/test/ext/assignmapper.py
@@ -1,6 +1,7 @@
 import testbase
 
 from sqlalchemy import *
+from sqlalchemy import exceptions
 from sqlalchemy.orm import create_session, clear_mappers, relation, class_mapper
 from sqlalchemy.ext.assignmapper import assign_mapper
 from sqlalchemy.ext.sessioncontext import SessionContext
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"""
 
diff --git a/test/sql/constraints.py b/test/sql/constraints.py
index a8b642b9b..93ba231ab 100644
--- a/test/sql/constraints.py
+++ b/test/sql/constraints.py
@@ -1,5 +1,6 @@
 import testbase
 from sqlalchemy import *
+from sqlalchemy import exceptions
 from testlib import *
 
 class ConstraintTest(AssertMixin):
diff --git a/test/sql/defaults.py b/test/sql/defaults.py
index 76bd2c41f..953eb7a35 100644
--- a/test/sql/defaults.py
+++ b/test/sql/defaults.py
@@ -1,7 +1,6 @@
 import testbase
 from sqlalchemy import *
-import sqlalchemy.util as util
-import sqlalchemy.schema as schema
+from sqlalchemy import exceptions, schema, util
 from sqlalchemy.orm import mapper, create_session
 from testlib import *
 import datetime
diff --git a/test/sql/quote.py b/test/sql/quote.py
index 0c414af3a..9d3c8505d 100644
--- a/test/sql/quote.py
+++ b/test/sql/quote.py
@@ -1,7 +1,8 @@
 import testbase
 from sqlalchemy import *
-from testlib import *
+from sqlalchemy import sql
 from sqlalchemy.sql import compiler
+from testlib import *
 
 class QuoteTest(PersistTest):
     def setUpAll(self):
diff --git a/test/sql/select.py b/test/sql/select.py
index 2d3f57954..fa5e3af03 100644
--- a/test/sql/select.py
+++ b/test/sql/select.py
@@ -1,7 +1,7 @@
 import testbase
 import re, operator
 from sqlalchemy import *
-from sqlalchemy import util
+from sqlalchemy import exceptions, sql, util
 from sqlalchemy.sql import table, column
 from sqlalchemy.databases import sqlite, postgres, mysql, oracle, firebird, mssql
 from testlib import *
diff --git a/test/sql/testtypes.py b/test/sql/testtypes.py
index f4a9d3c70..362089967 100644
--- a/test/sql/testtypes.py
+++ b/test/sql/testtypes.py
@@ -2,6 +2,7 @@ import testbase
 import pickleable
 import datetime, os
 from sqlalchemy import *
+from sqlalchemy import types
 import sqlalchemy.engine.url as url
 from sqlalchemy.databases import mssql, oracle, mysql
 from testlib import *
diff --git a/test/testlib/fixtures.py b/test/testlib/fixtures.py
index ab44838e7..15bf167f7 100644
--- a/test/testlib/fixtures.py
+++ b/test/testlib/fixtures.py
@@ -1,5 +1,6 @@
 import testbase
 from sqlalchemy import *
+from sqlalchemy import util
 from testlib import *
 
 _recursion_stack = util.Set()