diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2018-03-14 19:07:59 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-14 19:07:59 -0600 |
commit | 020f2ad4e133b7500c7062d89368d38f19e836fd (patch) | |
tree | 37054f48b52d3725f7b1f6a840fd0f0d40ba2399 /numpy/lib/function_base.py | |
parent | a91f61a429e35a47f6faa025ceb862664dc12609 (diff) | |
parent | 53b358ce7eddf78ac2bc22045fbe25e91e663b9a (diff) | |
download | numpy-020f2ad4e133b7500c7062d89368d38f19e836fd.tar.gz |
Merge pull request #10743 from fred-lefebvre/master
MAINT: Import abstract classes from collections.abc
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r-- | numpy/lib/function_base.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 422a87322..07b845e2b 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -1,6 +1,11 @@ from __future__ import division, absolute_import, print_function -import collections +try: + # Accessing collections abstact classes from collections + # has been deprecated since Python 3.3 + import collections.abc as collections_abc +except ImportError: + import collections as collections_abc import re import sys import warnings @@ -547,7 +552,7 @@ def piecewise(x, condlist, funclist, *args, **kw): y = zeros(x.shape, x.dtype) for k in range(n): item = funclist[k] - if not isinstance(item, collections.Callable): + if not isinstance(item, collections_abc.Callable): y[condlist[k]] = item else: vals = x[condlist[k]] |