diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2016-04-04 12:39:39 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2016-04-04 12:39:39 -0600 |
commit | 6198616b25d50abc9aabbce6784c10aaa10b33ce (patch) | |
tree | 78995df9b552c30ff790250c1ae3655fd7908075 /numpy/testing/utils.py | |
parent | 2fb95995d402cd065f83e72d596bfdf17be9ea57 (diff) | |
download | numpy-6198616b25d50abc9aabbce6784c10aaa10b33ce.tar.gz |
MAINT: Remove nose.SkipTest import.
This was only needed for Python 2.6 as it is available from unittest in
later Python versions.
Diffstat (limited to 'numpy/testing/utils.py')
-rw-r--r-- | numpy/testing/utils.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index 133330a12..9511e00be 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -13,6 +13,7 @@ from functools import partial import shutil import contextlib from tempfile import mkdtemp, mkstemp +from unittest.case import SkipTest from .nosetester import import_nose from numpy.core import float32, empty, arange, array_repr, ndarray @@ -38,20 +39,11 @@ class KnownFailureException(Exception): '''Raise this exception to mark a test as a known failing test.''' pass -KnownFailureTest = KnownFailureException # backwards compat - - -# nose.SkipTest is unittest.case.SkipTest -# import it into the namespace, so that it's available as np.testing.SkipTest -try: - from unittest.case import SkipTest -except ImportError: - # on py2.6 unittest.case is not available. Ask nose for a replacement. - SkipTest = import_nose().SkipTest - +KnownFailureTest = KnownFailureException # backwards compat verbose = 0 + def assert_(val, msg=''): """ Assert that works in release mode. |