migrated __ALL__ to __all__, oops, and reworked module

import scheme

23 files changed, 40 insertions, 36 deletions

diff --git a/doc/build/components/pydoc.myt b/doc/build/components/pydoc.myt
index 8d09f8bca..5cb58628b 100644
--- a/doc/build/components/pydoc.myt
+++ b/doc/build/components/pydoc.myt
@@ -16,8 +16,8 @@
         name= obj.__name__
         
         if not isclass:
-            if hasattr(obj, '__ALL__'):
-                objects = obj.__ALL__
+            if hasattr(obj, '__all__'):
+                objects = obj.__all__
                 sort = True
             else:
                 objects = obj.__dict__.keys()
diff --git a/doc/build/lib/highlight.py b/doc/build/lib/highlight.py
index 5841e6984..4f8fbac12 100644
--- a/doc/build/lib/highlight.py
+++ b/doc/build/lib/highlight.py
@@ -23,7 +23,7 @@ import token, tokenize, keyword
 
 # Highlighter - highlights Myghty and Python source code
 
-__ALL__ = ['highlight', 'PythonHighlighter', 'MyghtyHighlighter']
+__all__ = ['highlight', 'PythonHighlighter', 'MyghtyHighlighter']
 
 pystyles = {
     token.ENDMARKER : 'python_operator' ,
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 0a250646a..4e8b62151 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -15,3 +15,8 @@
 # along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+import sqlalchemy.mapper as mapperlib
+from sqlalchemy.schema import *
+from sqlalchemy.sql import *
+from sqlalchemy.types import *
+from sqlalchemy.mapper import *
\ No newline at end of file
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index 4d65a70ce..99402aebb 100644
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -24,7 +24,7 @@ import sqlalchemy.sql as sql
 import sqlalchemy.engine
 from sqlalchemy.sql import *
 from sqlalchemy.util import *
-import string
+import string, re
 
 def engine(**params):
     return ANSISQLEngine(**params)
@@ -292,13 +292,13 @@ class ANSICompiler(sql.Compiled):
     def visit_update(self, update_stmt):
         colparams = update_stmt.get_colparams(self.bindparams)
         def create_param(p):
-            if isinstance(p, BindParamClause):
+            if isinstance(p, sql.BindParamClause):
                 self.binds[p.key] = p
                 self.binds[p.shortname] = p
                 return self.bindparam_string(p.key)
             else:
                 p.accept_visitor(self)
-                if isinstance(p, ClauseElement):
+                if isinstance(p, sql.ClauseElement):
                     return "(" + self.get_str(p) + ")"
                 else:
                     return self.get_str(p)
diff --git a/lib/sqlalchemy/databases/__init__.py b/lib/sqlalchemy/databases/__init__.py
index 2775af65c..0ea2bd6db 100644
--- a/lib/sqlalchemy/databases/__init__.py
+++ b/lib/sqlalchemy/databases/__init__.py
@@ -16,4 +16,4 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-__ALL__ = ['oracle', 'postgres', 'sqlite', 'mysql']
\ No newline at end of file
+__all__ = ['oracle', 'postgres', 'sqlite', 'mysql']
\ No newline at end of file
diff --git a/lib/sqlalchemy/databases/information_schema.py b/lib/sqlalchemy/databases/information_schema.py
index 51b9d94c1..fdd705ed2 100644
--- a/lib/sqlalchemy/databases/information_schema.py
+++ b/lib/sqlalchemy/databases/information_schema.py
@@ -3,6 +3,7 @@ import sqlalchemy.engine as engine
 import sqlalchemy.schema as schema
 import sqlalchemy.ansisql as ansisql
 import sqlalchemy.types as sqltypes
+from sqlalchemy import *
 from sqlalchemy.ansisql import *
 
 generic_engine = ansisql.engine()
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index e7f64c9b4..45d85187a 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -22,7 +22,7 @@ import sqlalchemy.engine as engine
 import sqlalchemy.schema as schema
 import sqlalchemy.ansisql as ansisql
 import sqlalchemy.types as sqltypes
-from sqlalchemy.ansisql import *
+from sqlalchemy import *
 import sqlalchemy.databases.information_schema as ischema
 
 try:
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index f1cea4288..9763c6978 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -21,7 +21,7 @@ import sys, StringIO, string
 import sqlalchemy.sql as sql
 import sqlalchemy.schema as schema
 import sqlalchemy.ansisql as ansisql
-from sqlalchemy.ansisql import *
+from sqlalchemy import *
 import sqlalchemy.types as sqltypes
 
 try:
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index a25700934..c8e742fe4 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -22,7 +22,7 @@ import sqlalchemy.engine as engine
 import sqlalchemy.schema as schema
 import sqlalchemy.ansisql as ansisql
 import sqlalchemy.types as sqltypes
-from sqlalchemy.ansisql import *
+from sqlalchemy import *
 import sqlalchemy.databases.information_schema as ischema
 
 try:
diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py
index ef6c8de00..756ae90ca 100644
--- a/lib/sqlalchemy/engine.py
+++ b/lib/sqlalchemy/engine.py
@@ -39,7 +39,7 @@ def create_engine(name, *args ,**kwargs):
 
 def engine_descriptors():
     result = []
-    for module in sqlalchemy.databases.__ALL__:
+    for module in sqlalchemy.databases.__all__:
         module = getattr(__import__('sqlalchemy.databases.%s' % module).databases, module)
         result.append(module.descriptor())
     return result
diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py
index ce3cb0566..86527a110 100644
--- a/lib/sqlalchemy/mapper.py
+++ b/lib/sqlalchemy/mapper.py
@@ -26,8 +26,10 @@ import sqlalchemy.util as util
 import sqlalchemy.objectstore as objectstore
 import random, copy, types
 
-__ALL__ = ['relation', 'eagerload', 'lazyload', 'noload', 'assignmapper', 
-        'mapper', 'clear_mappers', 'objectstore', 'sql', 'extension', 'class_mapper', 'object_mapper', 'MapperExtension']
+__all__ = ['relation', 'eagerload', 'lazyload', 'noload', 'assignmapper', 
+        'mapper', 'clear_mappers', 'objectstore', 'sql', 'extension', 'class_mapper', 'object_mapper', 'MapperExtension',
+        'ColumnProperty'
+        ]
 
 def relation(*args, **params):
     """provides a relationship of a primary Mapper to a secondary Mapper, which corresponds
diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index cbce4e916..c0250ef96 100644
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -27,6 +27,9 @@ import sqlalchemy.attributes as attributes
 import weakref
 import string
 
+__all__ = ['get_id_key', 'get_row_key', 'commit', 'update', 'clear', 'delete', 
+        'begin', 'has_key', 'has_instance', 'UnitOfWork']
+
 def get_id_key(ident, class_, table):
     """returns an identity-map key for use in storing/retrieving an item from the identity
     map, given a tuple of the object's primary key values.
@@ -665,10 +668,10 @@ class UOWTask(object):
         return ("UOWTask/%d Table: '%s'" % (id(self), self.mapper and self.mapper.primarytable.name or '(none)'))
         
 def mapper(*args, **params):
-    return sqlalchemy.mapper.mapper(*args, **params)
+    return sqlalchemy.mapperlib.mapper(*args, **params)
 
 def object_mapper(obj):
-    return sqlalchemy.mapper.object_mapper(obj)
+    return sqlalchemy.mapperlib.object_mapper(obj)
 
 
 global_attributes = UOWAttributeManager()
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 983ce7084..3eb68d8b9 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -20,7 +20,7 @@ from sqlalchemy.types import *
 import copy, re
 
 
-__ALL__ = ['SchemaItem', 'Table', 'Column', 'ForeignKey', 'Sequence', 'SchemaEngine', 'SchemaVisitor']
+__all__ = ['SchemaItem', 'Table', 'Column', 'ForeignKey', 'Sequence', 'SchemaEngine', 'SchemaVisitor']
 
 
 class SchemaItem(object):
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 83ac01a23..fc4d42762 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -23,7 +23,7 @@ import sqlalchemy.util as util
 import sqlalchemy.types as types
 import string, re
 
-__ALL__ = ['text', 'column', 'func', 'select', 'join', 'and_', 'or_', 'not_', 'union', 'unionall', 'desc', 'asc', 'outerjoin', 'alias', 'subquery', 'bindparam', 'sequence']
+__all__ = ['text', 'column', 'func', 'select', 'update', 'insert', 'delete', 'join', 'and_', 'or_', 'not_', 'union', 'union_all', 'desc', 'asc', 'outerjoin', 'alias', 'subquery', 'bindparam', 'sequence', 'exists']
 
 def desc(column):
     """returns a descending ORDER BY clause element, e.g.:
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index 0e30a98a0..fc29f8056 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -15,7 +15,7 @@
 # along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-__ALL__ = [ 'TypeEngine', 'TypeDecorator', 'NullTypeEngine',
+__all__ = [ 'TypeEngine', 'TypeDecorator', 'NullTypeEngine',
             'INT', 'CHAR', 'VARCHAR', 'TEXT', 'FLOAT', 'DECIMAL', 
             'TIMESTAMP', 'DATETIME', 'CLOB', 'BLOB', 'BOOLEAN', 'String', 'Integer', 'Numeric', 'DateTime', 'Binary', 'Boolean', 'NULLTYPE'
             ]
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 61a154f9b..c474e3d10 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -15,7 +15,7 @@
 # along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-__ALL__ = ['OrderedProperties', 'OrderedDict']
+__all__ = ['OrderedProperties', 'OrderedDict']
 import thread, weakref, UserList,string
 import sqlalchemy.topological as topological
 
diff --git a/test/engines.py b/test/engines.py
index 317ad0e1f..d2fd10962 100644
--- a/test/engines.py
+++ b/test/engines.py
@@ -4,8 +4,7 @@ import sqlalchemy.databases.postgres as postgres
 import sqlalchemy.databases.oracle as oracle
 import sqlalchemy.databases.sqlite as sqllite
 
-from sqlalchemy.sql import *
-from sqlalchemy.schema import *
+from sqlalchemy import *
 
 from testbase import PersistTest
 import testbase
diff --git a/test/mapper.py b/test/mapper.py
index 57ba2f36e..deaa02c6c 100644
--- a/test/mapper.py
+++ b/test/mapper.py
@@ -1,8 +1,7 @@
 from testbase import PersistTest, AssertMixin
 import testbase
 import unittest, sys, os
-from sqlalchemy.mapper import *
-import sqlalchemy.objectstore as objectstore
+from sqlalchemy import *
 
 
 from tables import *
diff --git a/test/objectstore.py b/test/objectstore.py
index 6afa2c60f..09c5c87df 100644
--- a/test/objectstore.py
+++ b/test/objectstore.py
@@ -1,8 +1,7 @@
 from testbase import PersistTest, AssertMixin
 import unittest, sys, os
-from sqlalchemy.mapper import *
+from sqlalchemy import *
 import StringIO
-import sqlalchemy.objectstore as objectstore
 import testbase
 
 from tables import *
diff --git a/test/query.py b/test/query.py
index 17a0ef248..76fbcc078 100644
--- a/test/query.py
+++ b/test/query.py
@@ -6,8 +6,7 @@ import sqlalchemy.databases.sqlite as sqllite
 
 db = testbase.db
 
-from sqlalchemy.sql import *
-from sqlalchemy.schema import *
+from sqlalchemy import *
 
 class QueryTest(PersistTest):
     
diff --git a/test/select.py b/test/select.py
index aff61f2a2..5c6be355c 100644
--- a/test/select.py
+++ b/test/select.py
@@ -1,13 +1,11 @@
 
+from sqlalchemy import *
 import sqlalchemy.ansisql as ansisql
 import sqlalchemy.databases.postgres as postgres
 import sqlalchemy.databases.oracle as oracle
 
 db = ansisql.engine()
 
-from sqlalchemy.sql import *
-from sqlalchemy.schema import *
-
 from testbase import PersistTest
 import unittest, re
 
diff --git a/test/sequence.py b/test/sequence.py
index 605c855ea..4d4390d18 100644
--- a/test/sequence.py
+++ b/test/sequence.py
@@ -3,7 +3,7 @@ import sqlalchemy.util as util
 import unittest, sys, os
 import sqlalchemy.schema as schema
 import testbase
-from sqlalchemy.schema import *
+from sqlalchemy import *
 import sqlalchemy
 
 
diff --git a/test/tables.py b/test/tables.py
index 97363aa92..fa3c9150a 100644
--- a/test/tables.py
+++ b/test/tables.py
@@ -1,12 +1,11 @@
 
-from sqlalchemy.sql import *
-from sqlalchemy.schema import *
-from sqlalchemy.mapper import *
-import sqlalchemy
+from sqlalchemy import *
 import os
 import testbase
 
-__ALL__ = ['db', 'users', 'addresses', 'orders', 'orderitems', 'keywords', 'itemkeywords']
+__all__ = ['db', 'users', 'addresses', 'orders', 'orderitems', 'keywords', 'itemkeywords',
+            'User', 'Address', 'Order', 'Item', 'Keyword'
+        ]
 
 ECHO = testbase.echo
 db = testbase.db