summaryrefslogtreecommitdiff
path: root/numpy/lib/index_tricks.py
diff options
context:
space:
mode:
authorJulian Taylor <jtaylor.debian@googlemail.com>2015-01-21 19:54:12 +0100
committerJulian Taylor <jtaylor.debian@googlemail.com>2015-01-22 22:29:05 +0100
commit4f861238803aa9ab913a1011eabed3505a3f703d (patch)
tree5da6679a4c908de2574ea49ebb1254360bfb7761 /numpy/lib/index_tricks.py
parent960433e8f5f39587d10c60ed1d3f50591434a82b (diff)
downloadnumpy-4f861238803aa9ab913a1011eabed3505a3f703d.tar.gz
MAINT: merge _compiled_base module into multiarray
Allows access to internal functions for the file.
Diffstat (limited to 'numpy/lib/index_tricks.py')
-rw-r--r--numpy/lib/index_tricks.py2
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