diff options
| author | Jaime <jaime.frio@gmail.com> | 2015-01-23 12:15:09 -0800 |
|---|---|---|
| committer | Jaime <jaime.frio@gmail.com> | 2015-01-23 12:15:09 -0800 |
| commit | e0807a56f6c6717b006ba80c86c3149d51990f63 (patch) | |
| tree | 55bf5bdda25cef22e4503763a22771b52a771d92 /numpy/lib/index_tricks.py | |
| parent | d5e02707c041e97b0b6779e6d73eeb8b236576c7 (diff) | |
| parent | 90199336e34891448ce4052f322228906a72c774 (diff) | |
| download | numpy-e0807a56f6c6717b006ba80c86c3149d51990f63.tar.gz | |
Merge pull request #5476 from juliantaylor/merge-cbase
merge _compiled_base module into multiarray
Diffstat (limited to 'numpy/lib/index_tricks.py')
| -rw-r--r-- | numpy/lib/index_tricks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index f83024961..eb9aad6ad 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -12,7 +12,7 @@ from numpy.core.numerictypes import find_common_type from . import function_base import numpy.matrixlib as matrix from .function_base import diff -from numpy.lib._compiled_base import ravel_multi_index, unravel_index +from numpy.core.multiarray import ravel_multi_index, unravel_index from numpy.lib.stride_tricks import as_strided makemat = matrix.matrix |