merge

3 files changed, 11 insertions, 2 deletions

diff --git a/compat.py b/compat.py
index c9c5ff4..c025878 100644
--- a/compat.py
+++ b/compat.py
@@ -31,6 +31,14 @@ from warnings import warn
 import __builtin__
 
 try:
+    callable = callable
+except NameError:# callable removed from py3k
+    import collections
+    def callable(something):
+        return isinstance(something, collections.Callable)
+    del collections
+
+try:
     set = set
     frozenset = frozenset
 except NameError:
diff --git a/configuration.py b/configuration.py
index 4ec7992..4abb340 100644
--- a/configuration.py
+++ b/configuration.py
@@ -113,7 +113,7 @@ from ConfigParser import ConfigParser, NoOptionError, NoSectionError, \
      DuplicateSectionError
 from warnings import warn
 
-from logilab.common.compat import set, reversed
+from logilab.common.compat import set, reversed, callable
 from logilab.common.textutils import normalize_text, unquote
 from logilab.common.deprecation import deprecated
 from logilab.common import optik_ext as optparse
diff --git a/testlib.py b/testlib.py
index 6cbba42..df5a3f8 100644
--- a/testlib.py
+++ b/testlib.py
@@ -78,7 +78,8 @@ except ImportError:
     test_support = TestSupport()
 
 # pylint: disable=W0622
-from logilab.common.compat import set, enumerate, any, sorted, InheritableSet
+from logilab.common.compat import (set, enumerate, any, sorted, InheritableSet,
+                                   callable)
 # pylint: enable-msg=W0622
 from logilab.common.modutils import load_module_from_name
 from logilab.common.debugger import Debugger, colorize_source