diff options
| author | Stephan Hoyer <shoyer@google.com> | 2018-09-24 09:08:27 -0700 |
|---|---|---|
| committer | Stephan Hoyer <shoyer@google.com> | 2018-09-24 09:08:27 -0700 |
| commit | ceba9b3d659bd94ae25f71fd42c87df4ff43f78b (patch) | |
| tree | 0746f881d8bbce4ff93e72255dba82ac68ca16f9 /numpy/lib/tests/test_io.py | |
| parent | 1846ac335da808cb8bf6f9b1950933348a40d200 (diff) | |
| parent | 409aca108c6d6daf7f4fd0561d440ff4f30a0108 (diff) | |
| download | numpy-ceba9b3d659bd94ae25f71fd42c87df4ff43f78b.tar.gz | |
Merge branch 'master' into nep-18-initial
Diffstat (limited to 'numpy/lib/tests/test_io.py')
| -rw-r--r-- | numpy/lib/tests/test_io.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py index d9fed13dc..ef08c3f41 100644 --- a/numpy/lib/tests/test_io.py +++ b/numpy/lib/tests/test_io.py @@ -21,7 +21,7 @@ from numpy.lib._iotools import ConverterError, ConversionWarning from numpy.compat import asbytes, bytes, unicode, Path from numpy.ma.testutils import assert_equal from numpy.testing import ( - assert_warns, assert_, SkipTest, assert_raises_regex, assert_raises, + assert_warns, assert_, assert_raises_regex, assert_raises, assert_allclose, assert_array_equal, temppath, tempdir, IS_PYPY, HAS_REFCOUNT, suppress_warnings, assert_no_gc_cycles, ) @@ -2033,8 +2033,8 @@ M 33 21.99 encoding = locale.getpreferredencoding() utf8.encode(encoding) except (UnicodeError, ImportError): - raise SkipTest('Skipping test_utf8_file_nodtype_unicode, ' - 'unable to encode utf8 in preferred encoding') + pytest.skip('Skipping test_utf8_file_nodtype_unicode, ' + 'unable to encode utf8 in preferred encoding') with temppath() as path: with io.open(path, "wt") as f: |