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

omitting modules from sqlalchemy.__all__...

2 files changed, 23 insertions, 19 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 *