summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2013-02-20 09:16:41 +0100
committerRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2013-02-20 09:16:41 +0100
commit05bc4b3fd36b99955a1d9a56709b19a88410b4e4 (patch)
tree20a053c01206b4495ba1acfe1b6cdbb58337b9ed
parentce048159eae27a70e47b268f60aca4a82e87303a (diff)
downloadtox-05bc4b3fd36b99955a1d9a56709b19a88410b4e4.tar.gz
use py.builtin.callable instead of own backward compat
-rw-r--r--tox/_config.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/tox/_config.py b/tox/_config.py
index 086bb36..6e0a412 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)