diff options
| author | kumar <kumar.mcmillan@gmail.com> | 2011-03-18 23:38:55 -0500 |
|---|---|---|
| committer | kumar <kumar.mcmillan@gmail.com> | 2011-03-18 23:38:55 -0500 |
| commit | 16ad5c54468387d922c1f60cc134085a9f316f61 (patch) | |
| tree | cf3df90387dcb574d08699a19b17753956561d85 | |
| parent | 47bb9a1425747975b82d08e19b18762e69026e47 (diff) | |
| download | nose-16ad5c54468387d922c1f60cc134085a9f316f61.tar.gz | |
fixes addSkip for python 3.2 (issue 382); also adds 3.2 tests
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | nose/proxy.py | 3 | ||||
| -rw-r--r-- | nosetests.1 | 2 | ||||
| -rw-r--r-- | tox.ini | 15 |
4 files changed, 19 insertions, 7 deletions
@@ -1,4 +1,8 @@ -1.0 +1.0.1 + +- Fixed problems with SkipTest in Python 3.2 (#389) + +1.0.0 - Made nose compatible with python 3. **Huge** thanks to Alex "foogod" Stewart! diff --git a/nose/proxy.py b/nose/proxy.py index db21408..0d31d67 100644 --- a/nose/proxy.py +++ b/nose/proxy.py @@ -148,6 +148,9 @@ class ResultProxy(object): from nose.plugins.skip import SkipTest self.assertMyTest(test) plugins = self.plugins + if not isinstance(reason, Exception): + # for Python 3.2+ + reason = Exception(reason) plugins.addError(self.test, (SkipTest, reason, None)) self.result.addSkip(self.test, reason) diff --git a/nosetests.1 b/nosetests.1 index cde7b8f..e981883 100644 --- a/nosetests.1 +++ b/nosetests.1 @@ -466,5 +466,5 @@ jpellerin+nose@gmail.com .SH COPYRIGHT LGPL -.\" Generated by docutils manpage writer on 2011-02-01 13:49. +.\" Generated by docutils manpage writer on 2011-03-18 23:36. .\" @@ -1,5 +1,5 @@ [tox] -envlist=py31,py27,py26,py25,py24,jython,docs +envlist=py32,py31,py27,py26,py25,py24,jython,docs [testenv] deps= coverage >=3.3 @@ -25,8 +25,13 @@ commands= jython selftest.py [] [testenv:py31] -basepython=python3.1 -distribute=True commands= - python3.1 setup.py build_tests - python3.1 selftest.py [] + rm -fr {toxinidir}/build/tests + {envpython} setup.py build_tests + {envpython} selftest.py [] + +[testenv:py32] +commands= + rm -fr {toxinidir}/build/tests + {envpython} setup.py build_tests + {envpython} selftest.py [] |