summaryrefslogtreecommitdiff
path: root/numpy/lib/function_base.py
diff options
context:
space:
mode:
authorJaime <jaime.frio@gmail.com>2015-01-23 12:15:09 -0800
committerJaime <jaime.frio@gmail.com>2015-01-23 12:15:09 -0800
commite0807a56f6c6717b006ba80c86c3149d51990f63 (patch)
tree55bf5bdda25cef22e4503763a22771b52a771d92 /numpy/lib/function_base.py
parentd5e02707c041e97b0b6779e6d73eeb8b236576c7 (diff)
parent90199336e34891448ce4052f322228906a72c774 (diff)
downloadnumpy-e0807a56f6c6717b006ba80c86c3149d51990f63.tar.gz
Merge pull request #5476 from juliantaylor/merge-cbase
merge _compiled_base module into multiarray
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r--numpy/lib/function_base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 135053e43..2baf83830 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -23,9 +23,9 @@ from numpy.core.fromnumeric import (
from numpy.core.numerictypes import typecodes, number
from numpy.lib.twodim_base import diag
from .utils import deprecate
-from ._compiled_base import _insert, add_docstring
-from ._compiled_base import digitize, bincount, interp as compiled_interp
-from ._compiled_base import add_newdoc_ufunc
+from numpy.core.multiarray import _insert, add_docstring
+from numpy.core.multiarray import digitize, bincount, interp as compiled_interp
+from numpy.core.umath import _add_newdoc_ufunc as add_newdoc_ufunc
from numpy.compat import long
# Force range to be a generator, for np.delete's usage.