summaryrefslogtreecommitdiff
path: root/numpy/testing
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/testing')
-rw-r--r--numpy/testing/decorators.py2
-rw-r--r--numpy/testing/nosetester.py11
2 files changed, 7 insertions, 6 deletions
diff --git a/numpy/testing/decorators.py b/numpy/testing/decorators.py
index a7cc9a847..053b99211 100644
--- a/numpy/testing/decorators.py
+++ b/numpy/testing/decorators.py
@@ -210,7 +210,7 @@ def knownfailureif(fail_condition, msg=None):
from noseclasses import KnownFailureTest
def knownfailer(*args, **kwargs):
if fail_val():
- raise KnownFailureTest, msg
+ raise KnownFailureTest(msg)
else:
return f(*args, **kwargs)
return nose.tools.make_decorator(f)(knownfailer)
diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py
index a776faa43..60fec35d6 100644
--- a/numpy/testing/nosetester.py
+++ b/numpy/testing/nosetester.py
@@ -119,11 +119,12 @@ class NoseTester(object):
Notes
-----
- The default for `raise_warnings` is ``(DeprecationWarning, RuntimeWarning)``
- for the master branch of NumPy, and ``()`` for maintenance branches and
- released versions. The purpose of this switching behavior is to catch as
- many warnings as possible during development, but not give problems for
- packaging of released versions.
+ The default for `raise_warnings` is
+ ``(DeprecationWarning, RuntimeWarning)`` for the master branch of NumPy,
+ and ``()`` for maintenance branches and released versions. The purpose
+ of this switching behavior is to catch as many warnings as possible
+ during development, but not give problems for packaging of released
+ versions.
"""
# Stuff to exclude from tests. These are from numpy.distutils