Pulled callable into testlib because path fixup is not available at the point we...

diff --git a/test/testlib/compat.py b/test/testlib/compat.py
index 374f144f6433078540a2b0457dab1d6fca9bbb7a..73eb2d651fe5b6ef91cf88f4054a93972d4a768c 100644 (file)
--- a/test/testlib/compat.py
+++ b/test/testlib/compat.py
@@ -1,6 +1,7 @@
 import types
+import __builtin__
 
-__all__ = '_function_named',
+__all__ = '_function_named', 'callable'
 
 
 def _function_named(fn, newname):
@@ -11,3 +12,8 @@ def _function_named(fn, newname):
                           fn.func_defaults, fn.func_closure)
     return fn
 
+try:
+    callable = __builtin__.callable
+except NameError:
+    def callable(fn): return hasattr(fn, '__call__')
+

diff --git a/test/testlib/engines.py b/test/testlib/engines.py
index 2a16d3f494ec654006b840205063031470fb4486..4068f43d0a9f5a877a196acb9cc05e9baf8984d9 100644 (file)
--- a/test/testlib/engines.py
+++ b/test/testlib/engines.py
@@ -1,8 +1,7 @@
 import sys, types, weakref
 from collections import deque
 from testlib import config
-from testlib.compat import _function_named
-from sqlalchemy.util import callable
+from testlib.compat import _function_named, callable
 
 class ConnectionKiller(object):
     def __init__(self):

diff --git a/test/testlib/sa_unittest.py b/test/testlib/sa_unittest.py
index 8eb885829c95a2950ec98451c4abe7dda9fd1fcc..7eb2c07271265172be135efbf5b0976f10b5efa7 100644 (file)
--- a/test/testlib/sa_unittest.py
+++ b/test/testlib/sa_unittest.py
@@ -36,12 +36,12 @@ __author__ = "Steve Purcell"
 __email__ = "stephen_purcell at yahoo dot com"
 __version__ = "#Revision: 1.63 $"[11:-2]
 
-from sqlalchemy.util import callable
 import time
 import sys
 import traceback
 import os
 import types
+from testlib.compat import callable
 
 ##############################################################################
 # Exported classes and functions

diff --git a/test/testlib/testing.py b/test/testlib/testing.py
index 1712c39f5526109ad5fa8c6086744b363d87938d..fffb301f2f2996aadd3c7098e06a6c4bb37bf2ea 100644 (file)
--- a/test/testlib/testing.py
+++ b/test/testlib/testing.py
@@ -11,10 +11,8 @@ from testlib import sa_unittest as unittest
 import warnings
 from cStringIO import StringIO
 
-from sqlalchemy.util import callable
-
 import testlib.config as config
-from testlib.compat import _function_named
+from testlib.compat import _function_named, callable
 
 # Delayed imports
 MetaData = None