absolute imports in core, sql

17 files changed, 40 insertions, 47 deletions

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 08efee600..59964c364 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -7,7 +7,7 @@
 import inspect as _inspect
 import sys
 
-from sqlalchemy.sql import (
+from .sql import (
     alias,
     and_,
     asc,
@@ -47,7 +47,7 @@ from sqlalchemy.sql import (
     update,
     )
 
-from sqlalchemy.types import (
+from .types import (
     BIGINT,
     BINARY,
     BLOB,
@@ -92,7 +92,7 @@ from sqlalchemy.types import (
     )
 
 
-from sqlalchemy.schema import (
+from .schema import (
     CheckConstraint,
     Column,
     ColumnDefault,
@@ -112,9 +112,9 @@ from sqlalchemy.schema import (
     UniqueConstraint,
     )
 
-from sqlalchemy.inspection import inspect
+from .inspection import inspect
 
-from sqlalchemy.engine import create_engine, engine_from_config
+from .engine import create_engine, engine_from_config
 
 
 __all__ = sorted(name for name, obj in locals().items()
@@ -124,5 +124,5 @@ __version__ = '0.8.0b1'
 
 del _inspect, sys
 
-from sqlalchemy import util as _sa_util
+from . import util as _sa_util
 _sa_util.importlater.resolve_all()
diff --git a/lib/sqlalchemy/event.py b/lib/sqlalchemy/event.py
index dfdda3d44..03018f575 100644
--- a/lib/sqlalchemy/event.py
+++ b/lib/sqlalchemy/event.py
@@ -6,7 +6,7 @@
 
 """Base event API."""
 
-from sqlalchemy import util, exc
+from . import util, exc
 
 CANCEL = util.symbol('CANCEL')
 NO_RETVAL = util.symbol('NO_RETVAL')
diff --git a/lib/sqlalchemy/events.py b/lib/sqlalchemy/events.py
index ff8584cd9..a5ebb031a 100644
--- a/lib/sqlalchemy/events.py
+++ b/lib/sqlalchemy/events.py
@@ -6,7 +6,7 @@
 
 """Core event interfaces."""
 
-from sqlalchemy import event, exc, util
+from . import event, exc, util
 engine = util.importlater('sqlalchemy', 'engine')
 pool = util.importlater('sqlalchemy', 'pool')
 
diff --git a/lib/sqlalchemy/inspection.py b/lib/sqlalchemy/inspection.py
index 9ce52beab..91f222f69 100644
--- a/lib/sqlalchemy/inspection.py
+++ b/lib/sqlalchemy/inspection.py
@@ -16,7 +16,7 @@ so that they may return a context object given a certain kind
 of argument.
 """
 
-from sqlalchemy import util
+from . import util
 _registrars = util.defaultdict(list)
 
 def inspect(subject):
diff --git a/lib/sqlalchemy/interfaces.py b/lib/sqlalchemy/interfaces.py
index ed02ed0a8..02f9105ad 100644
--- a/lib/sqlalchemy/interfaces.py
+++ b/lib/sqlalchemy/interfaces.py
@@ -12,7 +12,7 @@ event system.
 
 """
 
-from sqlalchemy import event, util
+from . import event, util
 
 class PoolListener(object):
     """Hooks into the lifecycle of connections in a :class:`.Pool`.
diff --git a/lib/sqlalchemy/log.py b/lib/sqlalchemy/log.py
index e77730a98..d82cae634 100644
--- a/lib/sqlalchemy/log.py
+++ b/lib/sqlalchemy/log.py
@@ -19,7 +19,7 @@ instance only.
 
 import logging
 import sys
-from sqlalchemy import util
+from . import util
 
 # set initial level to WARN.  This so that
 # log statements don't occur in the absense of explicit
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index a6aea9b2b..44cb684bb 100644
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -19,7 +19,6 @@ from .attributes import (
     SQL_OK, NEVER_SET, ATTR_WAS_SET, NO_VALUE,\
     PASSIVE_NO_INITIALIZE
     )
-
 mapperlib = util.importlater("sqlalchemy.orm", "mapperlib")
 sessionlib = util.importlater("sqlalchemy.orm", "session")
 
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index f9e0f98dd..4f06bd5d9 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -18,9 +18,9 @@ SQLAlchemy connection pool.
 
 import weakref, time, traceback
 
-from sqlalchemy import exc, log, event, events, interfaces, util
-from sqlalchemy.util import queue as sqla_queue
-from sqlalchemy.util import threading, memoized_property, \
+from . import exc, log, event, events, interfaces, util
+from .util import queue as sqla_queue
+from .util import threading, memoized_property, \
     chop_traceback
 proxies = {}
 
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index d50b8af2a..132d7fb86 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -28,10 +28,8 @@ as components in SQL expressions.
 
 """
 import re, inspect
-from sqlalchemy import exc, util, dialects
-from sqlalchemy.sql import expression, visitors
-from sqlalchemy import event, events
-
+from . import exc, util, dialects, event, events
+from .sql import expression, visitors
 
 ddl = util.importlater("sqlalchemy.engine", "ddl")
 sqlutil = util.importlater("sqlalchemy.sql", "util")
diff --git a/lib/sqlalchemy/sql/__init__.py b/lib/sqlalchemy/sql/__init__.py
index eac845dcd..e25bb3160 100644
--- a/lib/sqlalchemy/sql/__init__.py
+++ b/lib/sqlalchemy/sql/__init__.py
@@ -4,7 +4,7 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from sqlalchemy.sql.expression import (
+from .expression import (
     Alias,
     ClauseElement,
     ColumnCollection,
@@ -62,7 +62,7 @@ from sqlalchemy.sql.expression import (
     update,
     )
 
-from sqlalchemy.sql.visitors import ClauseVisitor
+from .visitors import ClauseVisitor
 
 __tmp = locals().keys()
 __all__ = sorted([i for i in __tmp if not i.startswith('__')])
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 96ca1c57d..fe56b1a83 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -24,10 +24,10 @@ To generate user-defined SQL strings, see
 
 import re
 import sys
-from sqlalchemy import schema, engine, util, exc
-from sqlalchemy.sql import operators, functions, util as sql_util, \
-    visitors
-from sqlalchemy.sql import expression as sql
+from .. import schema, engine, util, exc
+from . import (
+    operators, functions, util as sql_util, visitors, expression as sql
+)
 import decimal
 
 RESERVED_WORDS = set([
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 6bf31e094..4be8a976d 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -29,10 +29,10 @@ to stay the same in future releases.
 import itertools, re
 from operator import attrgetter
 
-from sqlalchemy import util, exc
-from sqlalchemy.sql import operators
-from sqlalchemy.sql.operators import Operators, ColumnOperators
-from sqlalchemy.sql.visitors import Visitable, cloned_traverse
+from .. import util, exc
+from . import operators
+from .operators import ColumnOperators
+from .visitors import Visitable, cloned_traverse
 import operator
 
 functions = util.importlater("sqlalchemy.sql", "functions")
diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index aac97cff2..22f127fcc 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -4,12 +4,12 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from sqlalchemy import types as sqltypes, schema
-from sqlalchemy.sql.expression import (
+from .. import types as sqltypes, schema
+from .expression import (
     ClauseList, Function, _literal_as_binds, text, _type_from_args
     )
-from sqlalchemy.sql import operators
-from sqlalchemy.sql.visitors import VisitableType
+from . import operators
+from .visitors import VisitableType
 
 class _GenericMeta(VisitableType):
     def __call__(self, *args, **kwargs):
diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index 0c779ec43..866cc8f06 100644
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -17,7 +17,7 @@ from operator import (
 from operator import (div,)
 # end Py2K
 
-from sqlalchemy.util import symbol
+from ..util import symbol
 
 class Operators(object):
     """Base of comparison and logical operators.
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index c486f5cc1..83a75a77f 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.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 sqlalchemy import exc, schema, util, sql, types as sqltypes
-from sqlalchemy.util import topological
-from sqlalchemy.sql import expression, operators, visitors
+from .. import exc, schema, util, sql
+from ..util import topological
+from . import expression, operators, visitors
 from itertools import chain
 from collections import deque
 
diff --git a/lib/sqlalchemy/sql/visitors.py b/lib/sqlalchemy/sql/visitors.py
index 8a06982fc..a79168e75 100644
--- a/lib/sqlalchemy/sql/visitors.py
+++ b/lib/sqlalchemy/sql/visitors.py
@@ -25,7 +25,7 @@ http://techspot.zzzeek.org/2008/01/23/expression-transformations/
 
 from collections import deque
 import re
-from sqlalchemy import util
+from .. import util
 import operator
 
 __all__ = ['VisitableType', 'Visitable', 'ClauseVisitor', 
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index 6f30156dd..d524e0c40 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -20,18 +20,14 @@ __all__ = [ 'TypeEngine', 'TypeDecorator', 'AbstractType', 'UserDefinedType',
             'LargeBinary', 'Binary', 'Boolean', 'Unicode', 'Concatenable',
             'UnicodeText','PickleType', 'Interval', 'Enum' ]
 
-import inspect
 import datetime as dt
 import codecs
 
-from sqlalchemy import exc, schema
-from sqlalchemy.sql import expression, operators
-from sqlalchemy.util import pickle
-from sqlalchemy.util.compat import decimal
-from sqlalchemy.sql.visitors import Visitable
-from sqlalchemy import util
-from sqlalchemy import processors, events, event
-import collections
+from . import exc, schema, util, processors, events, event
+from .sql import operators
+from .util import pickle
+from .util.compat import decimal
+from .sql.visitors import Visitable
 default = util.importlater("sqlalchemy.engine", "default")
 
 NoneType = type(None)