summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2019-11-27 12:06:45 -0800
committerGitHub <noreply@github.com>2019-11-27 12:06:45 -0800
commitb491b988e86603df66447fbe8c8579905e42b00f (patch)
tree23a0cb1a109bfbb6d1bc05bd217cb824652923f9
parent78b143c4ddd5965bbb79cc9d47355d13ef9401ff (diff)
parentd0d250a3c9d7d90e75701c32d7d435640e6b02eb (diff)
downloadnumpy-b491b988e86603df66447fbe8c8579905e42b00f.tar.gz
Merge pull request #14983 from charris/revert-71fc59d
REV: "ENH: Improved performance of PyArray_FromAny for sequences of array-like
-rw-r--r--numpy/core/tests/test_regression.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
index d5de0f2b2..3880b1394 100644
--- a/numpy/core/tests/test_regression.py
+++ b/numpy/core/tests/test_regression.py
@@ -2484,26 +2484,6 @@ class TestRegression(object):
np.array([T()])
- def test_2d__array__shape(self):
- class T(object):
- def __array__(self):
- return np.ndarray(shape=(0,0))
-
- # Make sure __array__ is used instead of Sequence methods.
- def __iter__(self):
- return iter([])
-
- def __getitem__(self, idx):
- raise AssertionError("__getitem__ was called")
-
- def __len__(self):
- return 0
-
-
- t = T()
- #gh-13659, would raise in broadcasting [x=t for x in result]
- np.array([t])
-
@pytest.mark.skipif(sys.maxsize < 2 ** 31 + 1, reason='overflows 32-bit python')
@pytest.mark.skipif(sys.platform == 'win32' and sys.version_info[:2] < (3, 8),
reason='overflows on windows, fixed in bpo-16865')