diff options
author | Anthony Vo <anthonyhvo12@gmail.com> | 2021-04-05 23:27:23 +0700 |
---|---|---|
committer | Anthony Vo <anthonyhvo12@gmail.com> | 2021-04-05 23:27:23 +0700 |
commit | e4856c1197274a4b57b6ddc0e8ea7d7e4854986d (patch) | |
tree | d2a5dd5209cdd367a953b8c25f625cf94300f464 /numpy/core/fromnumeric.py | |
parent | 2c1410becc7fbe660426e2a946d54304fc470148 (diff) | |
parent | 7bb6a502ebaecd829e3c763e9f90220835e7b733 (diff) | |
download | numpy-e4856c1197274a4b57b6ddc0e8ea7d7e4854986d.tar.gz |
Merge branch 'main' of https://github.com/numpy/numpy into avo-exceptions-chaining
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r-- | numpy/core/fromnumeric.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index bb736d1a0..3646b39b0 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -10,8 +10,7 @@ from . import multiarray as mu from . import overrides from . import umath as um from . import numerictypes as nt -from ._asarray import asarray, array, asanyarray -from .multiarray import concatenate +from .multiarray import asarray, array, asanyarray, concatenate from . import _methods _dt_ = nt.sctype2char |