diff options
| author | James Bourbeau <jrbourbeau@users.noreply.github.com> | 2018-10-26 01:45:14 -0500 |
|---|---|---|
| committer | Matti Picus <matti.picus@gmail.com> | 2018-10-26 09:45:14 +0300 |
| commit | 437534b06bf7ccd744170accd4283f39eeb26e57 (patch) | |
| tree | e7660fa6667d5820b330bda25166d783e5e671b4 /numpy/lib/index_tricks.py | |
| parent | 59465028a5ffa886b2b9e04e768a4cbf82f9efca (diff) | |
| download | numpy-437534b06bf7ccd744170accd4283f39eeb26e57.tar.gz | |
BUG: Revert linspace import for concatenation funcs (#12265)
BUG: test and fix import linspace in index_tricks
Diffstat (limited to 'numpy/lib/index_tricks.py')
| -rw-r--r-- | numpy/lib/index_tricks.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index 0cdf78c6d..ff2e00d3e 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -10,11 +10,10 @@ from numpy.core.numeric import ( ) from numpy.core.numerictypes import find_common_type, issubdtype -from . import function_base import numpy.matrixlib as matrixlib from .function_base import diff from numpy.core.multiarray import ravel_multi_index, unravel_index -from numpy.core import overrides +from numpy.core import overrides, linspace from numpy.lib.stride_tricks import as_strided @@ -346,7 +345,7 @@ class AxisConcatenator(object): step = 1 if isinstance(step, complex): size = int(abs(step)) - newobj = function_base.linspace(start, stop, num=size) + newobj = linspace(start, stop, num=size) else: newobj = _nx.arange(start, stop, step) if ndmin > 1: |