summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2019-04-13 19:35:47 -0600
committerGitHub <noreply@github.com>2019-04-13 19:35:47 -0600
commit396cc499afa87c49f1b357438c8262625f25666d (patch)
treebc0d7387709bfafd23b258f8350801c78be452ea /numpy/core/fromnumeric.py
parentcc8b978cc3c0abe57c3784b99302a04f2c2701d9 (diff)
parent82641c61b1a2d6d1b8cccce5a65f4215c94b99b2 (diff)
downloadnumpy-396cc499afa87c49f1b357438c8262625f25666d.tar.gz
Merge pull request #13324 from eric-wieser/move-asarray
MAINT: Move asarray helpers into their own module
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index cb10c3947..b4e5965d2 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -13,7 +13,8 @@ from . import multiarray as mu
from . import overrides
from . import umath as um
from . import numerictypes as nt
-from .numeric import asarray, array, asanyarray, concatenate
+from ._asarray import asarray, array, asanyarray
+from .multiarray import concatenate
from . import _methods
_dt_ = nt.sctype2char