more import cleanups

6 files changed, 29 insertions, 28 deletions

diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py
index 500dd0dba..038e37ad9 100644
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -53,7 +53,7 @@ url.py
 # not sure what this was used for
 #import sqlalchemy.databases
 
-from sqlalchemy.engine.base import (
+from .base import (
     BufferedColumnResultProxy,
     BufferedColumnRow,
     BufferedRowResultProxy,
@@ -71,8 +71,8 @@ from sqlalchemy.engine.base import (
     TwoPhaseTransaction,
     TypeCompiler
     )
-from sqlalchemy.engine import strategies
-from sqlalchemy import util
+from . import strategies
+from .. import util
 
 
 __all__ = (
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index d0c4ae348..e39420771 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -14,18 +14,18 @@ and result contexts.
 
 __all__ = [
     'BufferedColumnResultProxy', 'BufferedColumnRow',
-    'BufferedRowResultProxy','Compiled', 'Connectable', 'Connection',
-    'Dialect', 'Engine','ExecutionContext', 'NestedTransaction',
-    'ResultProxy', 'RootTransaction','RowProxy', 'SchemaIterator',
+    'BufferedRowResultProxy', 'Compiled', 'Connectable', 'Connection',
+    'Dialect', 'Engine', 'ExecutionContext', 'NestedTransaction',
+    'ResultProxy', 'RootTransaction', 'RowProxy',
     'StringIO', 'Transaction', 'TwoPhaseTransaction',
     'connection_memoize']
 
-import inspect, StringIO, sys, operator
+import StringIO
+import sys
 from itertools import izip, chain
-from sqlalchemy import exc, schema, util, types, log, interfaces, \
+from .. import exc, schema, util, types, log, interfaces, \
     event, events
-from sqlalchemy.sql import expression, util as sql_util
-from sqlalchemy import processors
+from ..sql import expression, util as sql_util
 import collections
 
 class Dialect(object):
diff --git a/lib/sqlalchemy/engine/ddl.py b/lib/sqlalchemy/engine/ddl.py
index c3b32505e..f95e549b0 100644
--- a/lib/sqlalchemy/engine/ddl.py
+++ b/lib/sqlalchemy/engine/ddl.py
@@ -6,8 +6,8 @@
 
 """Routines to handle CREATE/DROP workflow."""
 
-from sqlalchemy import engine, schema
-from sqlalchemy.sql import util as sql_util
+from .. import schema
+from ..sql import util as sql_util
 
 
 class DDLBase(schema.SchemaVisitor):
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 38856b49e..bdba7caed 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -12,10 +12,11 @@ as the base class for their own corresponding classes.
 
 """
 
-import re, random
-from sqlalchemy.engine import base, reflection
-from sqlalchemy.sql import compiler, expression
-from sqlalchemy import exc, types as sqltypes, util, pool, processors
+import re
+import random
+from . import base, reflection
+from ..sql import compiler, expression
+from .. import exc, types as sqltypes, util, pool, processors
 import codecs
 import weakref
 
diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index e1d702146..f991a4acd 100644
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -24,15 +24,14 @@ methods such as get_table_names, get_columns, etc.
    'name' attribute..
 """
 
-import sqlalchemy
-from sqlalchemy import exc, sql
-from sqlalchemy import schema as sa_schema
-from sqlalchemy import util
-from sqlalchemy.types import TypeEngine
-from sqlalchemy.util import deprecated
-from sqlalchemy.util import topological
-from sqlalchemy import inspection
-from sqlalchemy.engine.base import Connectable
+from .. import exc, sql
+from .. import schema as sa_schema
+from .. import util
+from ..types import TypeEngine
+from ..util import deprecated
+from ..util import topological
+from .. import inspection
+from .base import Connectable
 
 @util.decorator
 def cache(fn, self, con, *args, **kw):
diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py
index 5bbdb9d65..c1c02bb29 100644
--- a/lib/sqlalchemy/engine/url.py
+++ b/lib/sqlalchemy/engine/url.py
@@ -12,9 +12,10 @@ with a string argument; alternatively, the URL is a public-facing construct whic
 be used directly and is also accepted directly by ``create_engine()``.
 """
 
-import re, urllib
-from sqlalchemy import exc, util
-from sqlalchemy.engine import base
+import re
+import urllib
+from .. import exc, util
+from . import base
 
 
 class URL(object):