Callable must be defined before path magic occurs.

diff --git a/test/testlib/compat.py b/test/testlib/compat.py
index 3fb1131af9e2eac712cc3baf9438e87d0ed6b9e1..ae27e6c3554d12759234e7ba0e6272fbf611dff4 100644 (file)
--- a/test/testlib/compat.py
+++ b/test/testlib/compat.py
@@ -12,5 +12,8 @@ def _function_named(fn, newname):
                           fn.func_defaults, fn.func_closure)
     return fn
 
-from sqlalchemy.util import callable
+try:
+    import callable
+except ImportError:
+    callable = lambda x: hasattr(x, '__call__')
 

diff --git a/test/testlib/testing.py b/test/testlib/testing.py
index d9df784524bcc044498d6da0f49b1d45e2e9f41a..5e28dfb576b75a955421cdaa6823c75827e3c269 100644 (file)
--- a/test/testlib/testing.py
+++ b/test/testlib/testing.py
@@ -12,7 +12,7 @@ import warnings
 from cStringIO import StringIO
 
 import testlib.config as config
-from testlib.compat import _function_named, callable
+from testlib.compat import _function_named
 
 # Delayed imports
 MetaData = None