converted imports to absolute

24 files changed, 61 insertions, 83 deletions

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index acbacafa4..27d3ed667 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -4,9 +4,9 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from types import *
-from sql import *
-from schema import *
+from sqlalchemy.types import *
+from sqlalchemy.sql import *
+from sqlalchemy.schema import *
 from sqlalchemy.orm import *
 
 from sqlalchemy.engine import create_engine
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index 43c6afd8e..a0ce64905 100644
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -8,7 +8,7 @@
 in the sql module."""
 
 from sqlalchemy import schema, sql, engine, util, sql_util
-import sqlalchemy.engine.default as default
+from  sqlalchemy.engine import default
 import string, re, sets, weakref
 
 ANSI_FUNCS = sets.ImmutableSet([
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 93a2cf864..bcbe5f670 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -14,7 +14,7 @@ import sqlalchemy.schema as schema
 import sqlalchemy.ansisql as ansisql
 import sqlalchemy.types as sqltypes
 import sqlalchemy.exceptions as exceptions
-import information_schema as ischema
+from sqlalchemy.databases import information_schema as ischema
 from sqlalchemy import * 
 import re
 
diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py
index e2a8edf69..a53ea4971 100644
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -4,10 +4,9 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-import sqlalchemy.databases
-
-from base import *
-import strategies
+from sqlalchemy import databases
+from sqlalchemy.engine.base import *
+from sqlalchemy.engine import strategies
 import re
 
 def engine_descriptors():
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index ea542fe5b..02d3e4608 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -6,9 +6,9 @@
 
 
 from sqlalchemy import schema, exceptions, util, sql, types
-import sqlalchemy.pool
+from sqlalchemy import  pool as poollib
 import StringIO, sys, re
-import base
+from sqlalchemy.engine import base
 
 """provides default implementations of the engine interfaces"""
 
@@ -22,7 +22,7 @@ class PoolConnectionProvider(base.ConnectionProvider):
             kwargs.setdefault('echo', False)
             kwargs.setdefault('use_threadlocal',True)
             if poolclass is None:
-                poolclass = sqlalchemy.pool.QueuePool
+                poolclass = poollib.QueuePool
             dbapi = dialect.dbapi()
             if dbapi is None:
                 raise exceptions.InvalidRequestError("Cant get DBAPI module for dialect '%s'" % dialect)
@@ -34,7 +34,7 @@ class PoolConnectionProvider(base.ConnectionProvider):
             creator = kwargs.pop('creator', connect)
             self._pool = poolclass(creator, **kwargs)
         else:
-            if isinstance(pool, sqlalchemy.pool.DBProxy):
+            if isinstance(pool, poollib.DBProxy):
                 self._pool = pool.get_pool(*cargs, **cparams)
             else:
                 self._pool = pool
diff --git a/lib/sqlalchemy/engine/threadlocal.py b/lib/sqlalchemy/engine/threadlocal.py
index a04e8edbe..beac3ee3f 100644
--- a/lib/sqlalchemy/engine/threadlocal.py
+++ b/lib/sqlalchemy/engine/threadlocal.py
@@ -1,6 +1,6 @@
 from sqlalchemy import schema, exceptions, util, sql, types
 import StringIO, sys, re
-import base, default
+from sqlalchemy.engine import base, default
 
 """provides a thread-local transactional wrapper around the basic ComposedSQLEngine.  multiple calls to engine.connect()
 will return the same connection for the same thread. also provides begin/commit methods on the engine itself
diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py
index 9b0e9f39e..f492ce425 100644
--- a/lib/sqlalchemy/engine/url.py
+++ b/lib/sqlalchemy/engine/url.py
@@ -1,7 +1,7 @@
 import re
 import cgi
 import urllib
-import sqlalchemy.exceptions as exceptions
+from sqlalchemy import exceptions
 
 """provides the URL object as well as the make_url parsing function."""
 
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index b5c590b74..35ddacf15 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -8,17 +8,16 @@
 the mapper package provides object-relational functionality, building upon the schema and sql
 packages and tying operations to class properties and constructors.
 """
-from sqlalchemy import sql, schema, engine, util, exceptions
-from mapper import *
-from mapper import mapper_registry
-import mapper as mapperlib
-from query import Query
-from util import polymorphic_union
-import properties, strategies
-from session import Session as create_session
+from sqlalchemy import exceptions
+from sqlalchemy.orm.mapper import *
+from sqlalchemy.orm.mapper import mapper_registry, ExtensionOption
+from sqlalchemy.orm.query import Query
+from sqlalchemy.orm.util import polymorphic_union
+from sqlalchemy.orm import properties, strategies
+from sqlalchemy.orm.session import Session as create_session
 
 __all__ = ['relation', 'backref', 'eagerload', 'lazyload', 'noload', 'deferred', 'defer', 'undefer', 'extension', 
-        'mapper', 'clear_mappers', 'clear_mapper', 'sql', 'class_mapper', 'object_mapper', 'MapperExtension', 'Query', 
+        'mapper', 'clear_mappers', 'clear_mapper', 'class_mapper', 'object_mapper', 'MapperExtension', 'Query', 
         'cascade_mappers', 'polymorphic_union', 'create_session', 'synonym', 'contains_eager', 'EXT_PASS'
         ]
 
@@ -78,7 +77,7 @@ def extension(ext):
     beginning of the list of extensions that will be called in the context of the Query.
     
     used with query.options()."""
-    return mapperlib.ExtensionOption(ext)
+    return ExtensionOption(ext)
     
 def eagerload(name):
     """return a MapperOption that will convert the property of the given name
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index f5eb669f3..f7fb98673 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -5,9 +5,9 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 from sqlalchemy import util
-import util as orm_util
-import weakref
+from sqlalchemy.orm import util as orm_util
 from sqlalchemy import logging
+import weakref
 
 class InstrumentedAttribute(object):
     """a property object that instruments attribute access on object instances.  All methods correspond to 
diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index 0e74a3873..133d51b7f 100644
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -8,10 +8,10 @@
 """bridges the PropertyLoader (i.e. a relation()) and the UOWTransaction 
 together to allow processing of scalar- and list-based dependencies at flush time."""
 
-import sync
-from sync import ONETOMANY,MANYTOONE,MANYTOMANY
+from sqlalchemy.orm import sync
+from sqlalchemy.orm.sync import ONETOMANY,MANYTOONE,MANYTOMANY
 from sqlalchemy import sql, util
-import session as sessionlib
+from sqlalchemy.orm import session as sessionlib
 
 def create_dependency_processor(prop):
     types = {
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 812619499..bd5f4c7ec 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -6,11 +6,9 @@
 
 from sqlalchemy import sql, schema, util, exceptions, logging
 from sqlalchemy import sql_util as sqlutil
-import util as mapperutil
-import sync
-from interfaces import MapperProperty, MapperOption, OperationContext
-import query as querylib
-import session as sessionlib
+from sqlalchemy.orm import util as mapperutil
+from sqlalchemy.orm import sync
+from sqlalchemy.orm.interfaces import MapperProperty, MapperOption, OperationContext
 import weakref
 
 __all__ = ['Mapper', 'MapperExtension', 'class_mapper', 'object_mapper', 'EXT_PASS']
@@ -516,7 +514,7 @@ class Mapper(object):
         if not self.non_primary and (mapper_registry.has_key(self.class_key)):
              raise exceptions.ArgumentError("Class '%s' already has a primary mapper defined with entity name '%s'.  Use non_primary=True to create a non primary Mapper, or to create a new primary mapper, remove this mapper first via sqlalchemy.orm.clear_mapper(mapper), or preferably sqlalchemy.orm.clear_mappers() to clear all mappers." % (self.class_, self.entity_name))
 
-        sessionlib.attribute_manager.reset_class_managed(self.class_)
+        attribute_manager.reset_class_managed(self.class_)
     
         oldinit = self.class_.__init__
         def init(self, *args, **kwargs):
@@ -527,7 +525,7 @@ class Mapper(object):
 
                 # this gets the AttributeManager to do some pre-initialization,
                 # in order to save on KeyErrors later on
-                sessionlib.attribute_manager.init_attr(self)
+                attribute_manager.init_attr(self)
 
             if kwargs.has_key('_sa_session'):
                 session = kwargs.pop('_sa_session')
@@ -714,7 +712,8 @@ class Mapper(object):
     
     def instances(self, cursor, session, *mappers, **kwargs):
         """return a list of mapped instances corresponding to the rows in a given ResultProxy."""
-        return querylib.Query(self, session).instances(cursor, *mappers, **kwargs)
+        import sqlalchemy.orm.query
+        return sqlalchemy.orm.Query(self, session).instances(cursor, *mappers, **kwargs)
 
     def identity_key_from_row(self, row):
         """return an identity-map key for use in storing/retrieving an item from the identity map.
@@ -1186,7 +1185,7 @@ class Mapper(object):
         
         # this gets the AttributeManager to do some pre-initialization,
         # in order to save on KeyErrors later on
-        sessionlib.attribute_manager.init_attr(obj)
+        attribute_manager.init_attr(obj)
 
         return obj
 
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index a810e7e96..176989976 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -10,15 +10,11 @@ module to handle load operations.  PropertyLoader also relies upon the dependenc
 to handle flush-time dependency sorting and processing."""
 
 from sqlalchemy import sql, schema, util, exceptions, sql_util, logging
-import mapper
-import sync
-import strategies
-import attributes
-import session as sessionlib
-import dependency
-import util as mapperutil
+from sqlalchemy.orm import mapper, sync, strategies, attributes, dependency
+from sqlalchemy.orm import session as sessionlib
+from sqlalchemy.orm import util as mapperutil
 import sets, random
-from interfaces import *
+from sqlalchemy.orm.interfaces import *
 
 
 class SynonymProperty(MapperProperty):
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 607b37fd9..a2c662482 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -4,11 +4,9 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-import session as sessionlib
 from sqlalchemy import sql, util, exceptions, sql_util, logging
-
-import mapper
-from interfaces import OperationContext
+from sqlalchemy.orm import mapper
+from sqlalchemy.orm.interfaces import OperationContext
 
 __all__ = ['Query', 'QueryContext', 'SelectionContext']
 
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 8ca1930b3..921449a6a 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -5,7 +5,9 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 from sqlalchemy import util, exceptions, sql
-import unitofwork, query
+from sqlalchemy.orm import unitofwork, query
+from sqlalchemy.orm.mapper import object_mapper as _object_mapper
+from sqlalchemy.orm.mapper import class_mapper as _class_mapper
 import weakref
 import sqlalchemy
 
@@ -429,11 +431,6 @@ class Session(object):
         """deprecated; a synynom for merge()"""
         return self.merge(*args, **kwargs)
 
-def _object_mapper(obj):
-    return sqlalchemy.orm.object_mapper(obj)
-
-def _class_mapper(class_, **kwargs):
-    return sqlalchemy.orm.class_mapper(class_, **kwargs)
 
 # this is the AttributeManager instance used to provide attribute behavior on objects.
 # to all the "global variable police" out there:  its a stateless object.
@@ -453,4 +450,5 @@ def object_session(obj):
     return None
 
 unitofwork.object_session = object_session
-
+from sqlalchemy.orm import mapper
+mapper.attribute_manager = attribute_manager
\ No newline at end of file
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 6391f2ee8..bfcc377c0 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -7,10 +7,10 @@
 """sqlalchemy.orm.interfaces.LoaderStrategy implementations, and related MapperOptions."""
 
 from sqlalchemy import sql, schema, util, exceptions, sql_util, logging
-import mapper, query
-from interfaces import *
-import session as sessionlib
-import util as mapperutil
+from sqlalchemy.orm import mapper, query
+from sqlalchemy.orm.interfaces import *
+from sqlalchemy.orm import session as sessionlib
+from sqlalchemy.orm import util as mapperutil
 import sets, random
 
 
diff --git a/lib/sqlalchemy/orm/sync.py b/lib/sqlalchemy/orm/sync.py
index 9de68334b..156033868 100644
--- a/lib/sqlalchemy/orm/sync.py
+++ b/lib/sqlalchemy/orm/sync.py
@@ -6,11 +6,9 @@
 
 
 
-import sqlalchemy.sql as sql
-import sqlalchemy.schema as schema
-import sqlalchemy.exceptions as exceptions
+from sqlalchemy import sql, schema, exceptions
 from sqlalchemy import logging
-import util as mapperutil
+from sqlalchemy.orm import util as mapperutil
 
 """contains the ClauseSynchronizer class, which is used to map attributes between two objects
 in a manner corresponding to a SQL clause that compares column values."""
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index 815ffe029..915be7b22 100644
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -15,8 +15,8 @@ dirty, or deleted and provides the capability to flush all those changes at once
 """
 
 from sqlalchemy import util, logging, topological
-import sqlalchemy
-import attributes
+from sqlalchemy.orm import attributes
+from sqlalchemy.orm.mapper import object_mapper, class_mapper
 from sqlalchemy.exceptions import *
 import StringIO
 import weakref
@@ -843,11 +843,5 @@ class UOWExecutor(object):
 class DependencySorter(topological.QueueDependencySorter):
     pass
 
-def object_mapper(obj):
-    return sqlalchemy.object_mapper(obj)
-
-def class_mapper(class_):
-    return sqlalchemy.class_mapper(class_)
-
 attribute_manager = UOWAttributeManager()
 
diff --git a/lib/sqlalchemy/orm/uowdumper.py b/lib/sqlalchemy/orm/uowdumper.py
index 415916332..e569d0d9a 100644
--- a/lib/sqlalchemy/orm/uowdumper.py
+++ b/lib/sqlalchemy/orm/uowdumper.py
@@ -1,4 +1,4 @@
-import unitofwork
+from sqlalchemy.orm import unitofwork
 
 """dumps out a string representation of a UOWTask structure"""
 
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index ebc6a3dc8..d90a0a1d8 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -4,8 +4,7 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-import sqlalchemy.util as util
-import sqlalchemy.sql as sql
+from sqlalchemy import sql, util
 
 class CascadeOptions(object):
     """keeps track of the options sent to relation().cascade"""
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index d4b0d75d0..99504e136 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -17,7 +17,7 @@ except:
     import pickle
     
 from sqlalchemy import util, exceptions, logging
-import sqlalchemy.queue as Queue
+from sqlalchemy import queue as Queue
 
 try:
     import thread
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index a34310ac1..61b3d277a 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -8,7 +8,6 @@
 from sqlalchemy import util, exceptions
 from sqlalchemy import types as sqltypes
 import string, re, random, sets
-types = __import__('types')
 
 __all__ = ['text', 'table', 'column', 'func', 'select', 'update', 'insert', 'delete', 'join', 'and_', 'or_', 'not_', 'between_', 'case', 'cast', 'union', 'union_all', 'null', 'desc', 'asc', 'outerjoin', 'alias', 'subquery', 'literal', 'bindparam', 'exists', 'extract','AbstractDialect', 'ClauseParameters', 'ClauseVisitor', 'Executor', 'Compiled', 'ClauseElement', 'ColumnElement', 'ColumnCollection', 'FromClause', 'TableClause', 'Select', 'Alias', 'CompoundSelect','Join', 'Selectable']
 
diff --git a/lib/sqlalchemy/topological.py b/lib/sqlalchemy/topological.py
index 948b3cfea..2a9d027e7 100644
--- a/lib/sqlalchemy/topological.py
+++ b/lib/sqlalchemy/topological.py
@@ -32,7 +32,7 @@ realized this characteristic of the algorithm.
 """
 import string, StringIO
 from sets import *
-import sqlalchemy.util as util
+from sqlalchemy import util
 from sqlalchemy.exceptions import *
 
 class QueueDependencySorter(object):
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index 01c2d18f0..d7e9d8ce6 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -11,8 +11,7 @@ __all__ = [ 'TypeEngine', 'TypeDecorator', 'NullTypeEngine',
         'SMALLINT', 'DATE', 'TIME'
             ]
 
-import sqlalchemy.util as util
-import sqlalchemy.exceptions as exceptions
+from sqlalchemy import util, exceptions
 try:
     import cPickle as pickle
 except:
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index d5c6a3b92..3636d5523 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -11,7 +11,7 @@ except ImportError:
     import dummy_thread as thread
     import dummy_threading as threading
 
-from exceptions import *
+from sqlalchemy.exceptions import *
 import __builtin__
 
 try: