[Pytest-commit] commit/pytest: hpk42: fix <py27 tests with nose

[commits-noreply at bitbucket.org]

1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/1200d39c921f/
Changeset:   1200d39c921f
User:        hpk42
Date:        2013-09-06 12:32:55
Summary:     fix <py27 tests with nose
Affected #:  1 file

diff -r 5c8cf890c3b7fb1b75bc89edcec0515b2ac21aa0 -r 1200d39c921f8af41b3c62be2a017bcf7f165b1c _pytest/nose.py
--- a/_pytest/nose.py
+++ b/_pytest/nose.py
@@ -41,8 +41,9 @@
 
 def pytest_make_collect_report(collector):
     if sys.modules.get("unittest"):
-        SkipTest = py.std.unittest.SkipTest
-        collector.skip_exceptions += (SkipTest,)
+        SkipTest = getattr(py.std.unittest, "SkipTest", None)
+        if SkipTest is not None:
+            collector.skip_exceptions += (SkipTest,)
     if isinstance(collector, pytest.Generator):
         call_optional(collector.obj, 'setup')

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.