From: Michael Trier <mtrier@gmail.com>
Date: Fri, 30 Jan 2009 04:54:19 +0000 (+0000)
Subject: Callable must be defined before path magic occurs.
X-Git-Tag: rel_0_6_6~304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75c6d5a26b0f2f1af133b598a28665323df392da;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Callable must be defined before path magic occurs.
---

diff --git a/test/testlib/compat.py b/test/testlib/compat.py
index 3fb1131af9..ae27e6c355 100644
--- 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 d9df784524..5e28dfb576 100644
--- 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