Commits

Ronny Pfannschmidt committed ea96b4c

use py.builtin.callable instead of own backward compat

Comments (0)

Files changed (1)

 
 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(","):
 
             raise tox.exception.ConfigError(
                 "substitution key %r not found" % key)
-        if callable(val):
+        if py.builtin.callable(val):
             val = val()
         return str(val)