diff options
author | Philip Thiem <ptthiem@gmail.com> | 2013-02-19 19:17:54 -0600 |
---|---|---|
committer | Philip Thiem <ptthiem@gmail.com> | 2013-02-19 19:17:54 -0600 |
commit | 93cbd0b7eb702c07eb90cac380afd8d3fcd2b8fa (patch) | |
tree | bacb9cb4c95697562792646c67dc9a27d1e50c76 | |
parent | deb556ff9614a0198cb9a9bff45f0652b718a1c0 (diff) | |
download | tox-93cbd0b7eb702c07eb90cac380afd8d3fcd2b8fa.tar.gz |
It would seem that python 3.1 lacked the keyword "callable"
-rw-r--r-- | tox/_config.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tox/_config.py b/tox/_config.py index 9bc0d0f..086bb36 100644 --- a/tox/_config.py +++ b/tox/_config.py @@ -12,6 +12,15 @@ 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(","): if _name == "py": |