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

1 files changed, 7 insertions, 1 deletions

diff --git a/test/testlib/compat.py b/test/testlib/compat.py
index 374f144f6..73eb2d651 100644
--- 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__')
+