summaryrefslogtreecommitdiff
path: root/numpy/testing
diff options
context:
space:
mode:
authorMike Taves <mwtoews@gmail.com>2020-01-22 20:59:58 +1300
committerMike Taves <mwtoews@gmail.com>2020-01-22 22:04:18 +1300
commit1bc1fd6bc2ec9c68997736cec1ce5dd4a625ea2f (patch)
treea6d8caad7d2e691ac44966f61adc174d768f14ee /numpy/testing
parente94cec800304a6a467cf90ce4e7d3e207770b4b4 (diff)
downloadnumpy-1bc1fd6bc2ec9c68997736cec1ce5dd4a625ea2f.tar.gz
MAINT: Revise imports from collections.abc module
Diffstat (limited to 'numpy/testing')
-rw-r--r--numpy/testing/_private/decorators.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/numpy/testing/_private/decorators.py b/numpy/testing/_private/decorators.py
index 2012b80d3..661dcd91a 100644
--- a/numpy/testing/_private/decorators.py
+++ b/numpy/testing/_private/decorators.py
@@ -13,12 +13,7 @@ function name, setup and teardown functions and so on - see
``nose.tools`` for more information.
"""
-try:
- # Accessing collections abstract classes from collections
- # has been deprecated since Python 3.3
- import collections.abc as collections_abc
-except ImportError:
- import collections as collections_abc
+import collections.abc
from .utils import SkipTest, assert_warns, HAS_REFCOUNT
@@ -129,7 +124,7 @@ def skipif(skip_condition, msg=None):
import nose
# Allow for both boolean or callable skip conditions.
- if isinstance(skip_condition, collections_abc.Callable):
+ if isinstance(skip_condition, collections.abc.Callable):
skip_val = lambda: skip_condition()
else:
skip_val = lambda: skip_condition
@@ -205,7 +200,7 @@ def knownfailureif(fail_condition, msg=None):
msg = 'Test skipped due to known failure'
# Allow for both boolean or callable known failure conditions.
- if isinstance(fail_condition, collections_abc.Callable):
+ if isinstance(fail_condition, collections.abc.Callable):
fail_val = lambda: fail_condition()
else:
fail_val = lambda: fail_condition
@@ -260,7 +255,7 @@ def deprecated(conditional=True):
with assert_warns(DeprecationWarning):
f(*args, **kwargs)
- if isinstance(conditional, collections_abc.Callable):
+ if isinstance(conditional, collections.abc.Callable):
cond = conditional()
else:
cond = conditional