summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-04-25 10:17:25 -0600
committerGitHub <noreply@github.com>2018-04-25 10:17:25 -0600
commitd55743b0fc542a6e2004173e41732635fa6f505a (patch)
tree6cf141de3b21da5c48bc89c27f3508ec83e28b6c
parent81b8ccbeff1b484a797f7c2297f8f3d52b2df037 (diff)
parenta0d21d961ae77fa2bea8dea1be6b831b105b165f (diff)
downloadnumpy-d55743b0fc542a6e2004173e41732635fa6f505a.tar.gz
Merge pull request #10971 from eric-wieser/_array_from_buffer_3118
MAINT: Remove workaround for gh-10891
-rw-r--r--numpy/core/tests/test_multiarray.py20
1 files changed, 8 insertions, 12 deletions
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
index 00dfa6ada..3c5f90cfc 100644
--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
@@ -6522,20 +6522,16 @@ class TestNewBufferProtocol(object):
a = np.empty((1,) * 32)
self._check_roundtrip(a)
- def _make_ctype(shape, scalar_type):
- t = scalar_type
- for dim in shape[::-1]:
- t = dim * t
- return t
-
- # This creates deeply nested reference cycles that cause
- # np.lib.tests.test_io.test_load_refcount to erroneously fail (gh-10891).
- # Not making it a local ensure that the GC doesn't touch it during the tests
- c_u8_33d = _make_ctype((1,)*33, ctypes.c_uint8)
-
def test_error_too_many_dims(self):
+ def make_ctype(shape, scalar_type):
+ t = scalar_type
+ for dim in shape[::-1]:
+ t = dim * t
+ return t
+
# construct a memoryview with 33 dimensions
- m = memoryview(self.c_u8_33d())
+ c_u8_33d = make_ctype((1,)*33, ctypes.c_uint8)
+ m = memoryview(c_u8_33d())
assert_equal(m.ndim, 33)
assert_raises_regex(