summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi.cardona@free.fr>2014-09-18 00:40:13 +0200
committerRémi Cardona <remi.cardona@free.fr>2014-09-18 00:40:13 +0200
commitca25a55a1093de0a59a618fe33e6aa3f013e7d24 (patch)
tree9dd3de1dacf028fb392be947d9345138f8d755fa
parent2bb14547a774a9327b70844b35fc21f3a7ea068e (diff)
downloadlogilab-common-ca25a55a1093de0a59a618fe33e6aa3f013e7d24.tar.gz
[compat] Remove callable (related to #264017)
It's a builtin since at least python 2.0.
-rw-r--r--compat.py9
-rw-r--r--configuration.py2
-rw-r--r--decorators.py2
-rw-r--r--testlib.py3
4 files changed, 2 insertions, 14 deletions
diff --git a/compat.py b/compat.py
index 8c1db3d..6eafba8 100644
--- a/compat.py
+++ b/compat.py
@@ -50,15 +50,6 @@ else:
def str_encode(string, encoding):
return str(string)
-# XXX callable built-in seems back in all python versions
-try:
- callable = builtins.callable
-except AttributeError:
- from collections import Callable
- def callable(something):
- return isinstance(something, Callable)
- del Callable
-
# See also http://bugs.python.org/issue11776
if sys.version_info[0] == 3:
def method_type(callable, instance, klass):
diff --git a/configuration.py b/configuration.py
index ae53b10..a14fb95 100644
--- a/configuration.py
+++ b/configuration.py
@@ -120,7 +120,7 @@ from copy import copy
from ConfigParser import ConfigParser
from warnings import warn
-from logilab.common.compat import callable, raw_input, str_encode as _encode
+from logilab.common.compat import raw_input, str_encode as _encode
from logilab.common.deprecation import deprecated
from logilab.common.textutils import normalize_text, unquote
from logilab.common import optik_ext
diff --git a/decorators.py b/decorators.py
index 84810db..70b4690 100644
--- a/decorators.py
+++ b/decorators.py
@@ -23,7 +23,7 @@ import types
from time import clock, time
from inspect import isgeneratorfunction, getargspec
-from logilab.common.compat import callable, method_type
+from logilab.common.compat import method_type
# XXX rewrite so we can use the decorator syntax when keyarg has to be specified
diff --git a/testlib.py b/testlib.py
index e8c9339..2265ce2 100644
--- a/testlib.py
+++ b/testlib.py
@@ -87,9 +87,6 @@ except ImportError:
pass
test_support = TestSupport()
-# pylint: disable=W0622
-from logilab.common.compat import callable
-# pylint: enable=W0622
from logilab.common.debugger import Debugger, colorize_source
from logilab.common.decorators import cached, classproperty
from logilab.common import textutils