diff options
author | Emile Anclin <emile.anclin@logilab.fr> | 2010-09-13 15:09:57 +0200 |
---|---|---|
committer | Emile Anclin <emile.anclin@logilab.fr> | 2010-09-13 15:09:57 +0200 |
commit | 4ef71160c871b225078917c17f4393146838ee4b (patch) | |
tree | 4293b6ed7c0ed85aaf774d170fb045293f1a1c68 | |
parent | 215170f7b48fe1ad685d2c8785b4f47152ddbd15 (diff) | |
download | logilab-common-4ef71160c871b225078917c17f4393146838ee4b.tar.gz |
[py3k] add callable to compat.py
import "callable" where needed.
We can't use collections in python <= 2.5
-rw-r--r-- | compat.py | 8 | ||||
-rw-r--r-- | configuration.py | 2 | ||||
-rw-r--r-- | testlib.py | 3 |
3 files changed, 11 insertions, 2 deletions
@@ -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 @@ -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 |