summaryrefslogtreecommitdiff
path: root/numpy/testing/_private/utils.py
diff options
context:
space:
mode:
authorSeth Troisi <sethtroisi@google.com>2020-01-08 23:49:17 -0800
committerSeth Troisi <sethtroisi@google.com>2020-01-15 13:19:56 -0800
commit1427484e9015e73b7017ee9336ce914a6f15187b (patch)
tree2db89078addee6a01697ab8bd4160c25d59fffc4 /numpy/testing/_private/utils.py
parentb6bc0941d4f07310456079ab2497c3d1bde4a5e7 (diff)
downloadnumpy-1427484e9015e73b7017ee9336ce914a6f15187b.tar.gz
MAINT: Remove sys.version checks in tests
Diffstat (limited to 'numpy/testing/_private/utils.py')
-rw-r--r--numpy/testing/_private/utils.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/numpy/testing/_private/utils.py b/numpy/testing/_private/utils.py
index 69b2af4df..1b88d91f6 100644
--- a/numpy/testing/_private/utils.py
+++ b/numpy/testing/_private/utils.py
@@ -21,10 +21,7 @@ from numpy.core import(
intp, float32, empty, arange, array_repr, ndarray, isnat, array)
import numpy.linalg.lapack_lite
-if sys.version_info[0] >= 3:
- from io import StringIO
-else:
- from StringIO import StringIO
+from io import StringIO
__all__ = [
'assert_equal', 'assert_almost_equal', 'assert_approx_equal',
@@ -1344,14 +1341,7 @@ def assert_raises_regex(exception_class, expected_regexp, *args, **kwargs):
"""
__tracebackhide__ = True # Hide traceback for py.test
-
- if sys.version_info.major >= 3:
- funcname = _d.assertRaisesRegex
- else:
- # Only present in Python 2.7, missing from unittest in 2.6
- funcname = _d.assertRaisesRegexp
-
- return funcname(exception_class, expected_regexp, *args, **kwargs)
+ return _d.assertRaisesRegex(exception_class, expected_regexp, *args, **kwargs)
def decorate_methods(cls, decorator, testmatch=None):