7 files changed, 12 insertions, 15 deletions
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 65a06c28d..b6e188583 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.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 compat import callable, cmp, reduce, defaultdict, py25_dict, \
+from .compat import callable, cmp, reduce, defaultdict, py25_dict, \
     threading, py3k_warning, jython, pypy, win32, set_types, buffer, pickle, \
     update_wrapper, partial, md5_hex, decode_slice, dottedgetter,\
     parse_qsl, any, contextmanager, namedtuple, next, WeakSet
 
-from _collections import KeyedTuple, ImmutableContainer, immutabledict, \
+from ._collections import KeyedTuple, ImmutableContainer, immutabledict, \
     Properties, OrderedProperties, ImmutableProperties, OrderedDict, \
     OrderedSet, IdentitySet, OrderedIdentitySet, column_set, \
     column_dict, ordered_column_set, populate_column_dict, unique_list, \
@@ -17,7 +17,7 @@ from _collections import KeyedTuple, ImmutableContainer, immutabledict, \
     to_column_set, update_copy, flatten_iterator, \
     LRUCache, ScopedRegistry, ThreadLocalRegistry, WeakSequence
 
-from langhelpers import iterate_attributes, class_hierarchy, \
+from .langhelpers import iterate_attributes, class_hierarchy, \
     portable_instancemethod, unbound_method_to_callable, \
     getargspec_init, format_argspec_init, format_argspec_plus, \
     get_func_kwargs, get_cls_kwargs, decorator, as_interface, \
@@ -29,6 +29,6 @@ from langhelpers import iterate_attributes, class_hierarchy, \
     constructor_copy, methods_equivalent, chop_traceback, asint,\
     generic_repr, counter, PluginLoader, hybridmethod
 
-from deprecations import warn_deprecated, warn_pending_deprecation, \
+from .deprecations import warn_deprecated, warn_pending_deprecation, \
     deprecated, pending_deprecation
 
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index af3be8ec3..38d62fa4f 100644
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -10,8 +10,7 @@ import sys
 import itertools
 import weakref
 import operator
-from langhelpers import symbol
-from compat import time_func, threading
+from .compat import threading
 
 EMPTY_SET = frozenset()
 
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 9f8a3069d..f66024d0b 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -8,7 +8,6 @@
 
 import sys
 
-
 try:
     import threading
 except ImportError:
diff --git a/lib/sqlalchemy/util/deprecations.py b/lib/sqlalchemy/util/deprecations.py
index fc156f393..f1ff9a075 100644
--- a/lib/sqlalchemy/util/deprecations.py
+++ b/lib/sqlalchemy/util/deprecations.py
@@ -7,7 +7,7 @@
 """Helpers related to deprecation of functions, methods, classes, other
 functionality."""
 
-from sqlalchemy import exc
+from .. import exc
 import warnings
 import re
 from langhelpers import decorator
diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index e9e8e35c2..83d851f65 100644
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -15,9 +15,9 @@ import re
 import sys
 import types
 import warnings
-from compat import update_wrapper, set_types, threading, \
-    callable, inspect_getfullargspec, py3k_warning
-from sqlalchemy import exc
+from .compat import update_wrapper, set_types, threading, \
+    callable, inspect_getfullargspec
+from .. import exc
 
 def _unique_symbols(used, *bases):
     used = set(used)
diff --git a/lib/sqlalchemy/util/queue.py b/lib/sqlalchemy/util/queue.py
index 650733288..f7b35924c 100644
--- a/lib/sqlalchemy/util/queue.py
+++ b/lib/sqlalchemy/util/queue.py
@@ -24,7 +24,7 @@ within QueuePool.
 
 from collections import deque
 from time import time as _time
-from sqlalchemy.util import threading
+from .compat import threading
 import sys
 
 if sys.version_info < (2, 6):
diff --git a/lib/sqlalchemy/util/topological.py b/lib/sqlalchemy/util/topological.py
index 58227af20..4baedecb2 100644
--- a/lib/sqlalchemy/util/topological.py
+++ b/lib/sqlalchemy/util/topological.py
@@ -6,9 +6,8 @@
 
 """Topological sorting algorithms."""
 
-from sqlalchemy.exc import CircularDependencyError
-from sqlalchemy import util
-
+from ..exc import CircularDependencyError
+from .. import util
 
 __all__ = ['sort', 'sort_as_subsets', 'find_cycles']