summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2019-04-13 17:10:35 -0700
committerEric Wieser <wieser.eric@gmail.com>2019-04-13 17:40:43 -0700
commit82641c61b1a2d6d1b8cccce5a65f4215c94b99b2 (patch)
treefda5a1cb1cad2b7ef691a49c071e4ab6c02d8a05 /numpy/core/fromnumeric.py
parentb18e32efc3f5b77630a1d4f05399fc15c69831b3 (diff)
downloadnumpy-82641c61b1a2d6d1b8cccce5a65f4215c94b99b2.tar.gz
MAINT: Move asarray helpers into their own module
This is a direct move, with some tweaks to imports. This breaks a cyclic imports between `core.numeric` and `core.fromnumeric`. This doesn't affect the value of `np.core.numeric.__all__` which keeps code doing `from numpy.core.numeric import *` working.
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