- omitted 'table' and 'column' from 'from sqlalchemy import *'

- also omitted all modules and classes that aren't expicitly public
- omitted 'Smallinteger' (small i), but it's still in schema
- omitted NullType-related items from types.__all__
- patched up a few tests to use sql.table and sql.column, other related.

1 files changed, 6 insertions, 6 deletions

diff --git a/test/base/utils.py b/test/base/utils.py
index 97f3db06f..8df3a2b97 100644
--- a/test/base/utils.py
+++ b/test/base/utils.py
@@ -1,5 +1,5 @@
 import testbase
-from sqlalchemy import util, column, sql, exceptions
+from sqlalchemy import util, sql, exceptions
 from testlib import *
 
 
@@ -37,9 +37,9 @@ class OrderedDictTest(PersistTest):
 class ColumnCollectionTest(PersistTest):
     def test_in(self):
         cc = sql.ColumnCollection()
-        cc.add(column('col1'))
-        cc.add(column('col2'))
-        cc.add(column('col3'))
+        cc.add(sql.column('col1'))
+        cc.add(sql.column('col2'))
+        cc.add(sql.column('col3'))
         assert 'col1' in cc
         assert 'col2' in cc
 
@@ -53,9 +53,9 @@ class ColumnCollectionTest(PersistTest):
         cc1 = sql.ColumnCollection()
         cc2 = sql.ColumnCollection()
         cc3 = sql.ColumnCollection()
-        c1 = column('col1')
+        c1 = sql.column('col1')
         c2 = c1.label('col2')
-        c3 = column('col3')
+        c3 = sql.column('col3')
         cc1.add(c1)
         cc2.add(c2)
         cc3.add(c3)