diff options
author | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> | 2013-02-20 09:16:41 +0100 |
---|---|---|
committer | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> | 2013-02-20 09:16:41 +0100 |
commit | e57ce45f645136ac77d1d570399aa3bb720dcdb2 (patch) | |
tree | 7e825a5e802323886ed27865ddb3589d52496ac3 /tox | |
parent | f1d4bffcdb1fa154b66c789bebf56667ef43389a (diff) | |
download | tox-git-e57ce45f645136ac77d1d570399aa3bb720dcdb2.tar.gz |
use py.builtin.callable instead of own backward compat
--HG--
branch : develop-pip-win32
Diffstat (limited to 'tox')
-rw-r--r-- | tox/_config.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tox/_config.py b/tox/_config.py index 086bb365..6e0a4128 100644 --- a/tox/_config.py +++ b/tox/_config.py @@ -12,14 +12,6 @@ import py import tox -#needed if supporting 3.1 as they had removed callable -import collections -try: - callable = callable -except NameError: - def callable(x): - return isinstance(x, collections.Callable) - defaultenvs = {'jython': 'jython', 'pypy': 'pypy'} for _name in "py,py24,py25,py26,py27,py30,py31,py32,py33,py34".split(","): @@ -498,7 +490,7 @@ class IniReader: raise tox.exception.ConfigError( "substitution key %r not found" % key) - if callable(val): + if py.builtin.callable(val): val = val() return str(val) |