- Fixed the import weirdness in sqlalchemy.sql

to not export __names__ [ticket:1215].

diff --git a/CHANGES b/CHANGES
index 8899d280ae4ad617df9bf69a38f479a9c1122c61..c2b437d5d1e9b93c287583552fe0d66ee98210a8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,9 @@ CHANGES
       properly converted to IS NOT NULL based on not_().
       
 - sql
+    - Fixed the import weirdness in sqlalchemy.sql
+      to not export __names__ [ticket:1215].
+      
     - Added NotImplementedError for params() method
       on Insert/Update/Delete constructs.  These items
       currently don't support this functionality, which

diff --git a/lib/sqlalchemy/sql/__init__.py b/lib/sqlalchemy/sql/__init__.py
index 90e140936f15206b3b4d933b57577fc5b9e4f803..0b347ca3868f72ef978577249142e1a83264105a 100644 (file)
--- a/lib/sqlalchemy/sql/__init__.py
+++ b/lib/sqlalchemy/sql/__init__.py
@@ -53,5 +53,5 @@ from sqlalchemy.sql.expression import (
 
 from sqlalchemy.sql.visitors import ClauseVisitor
 
-
-__all__ = sorted(locals().keys())
+__tmp = locals().keys()
+__all__ = sorted([i for i in __tmp if not i.startswith('__')])