summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorMarten van Kerkwijk <mhvk@astro.utoronto.ca>2018-07-27 08:49:22 -0400
committerGitHub <noreply@github.com>2018-07-27 08:49:22 -0400
commit43bbeeff29b58a2ade71d7c6ab9c6b50abb45114 (patch)
tree5949f41cb9238967eb13de4a0ace8715417e10eb /numpy/lib
parent0124839917feb4f124d07dbfbf79915f01624a3a (diff)
parente3b0a3f743cb215cf8a61e318687e9b54a8691a5 (diff)
downloadnumpy-43bbeeff29b58a2ade71d7c6ab9c6b50abb45114.tar.gz
Merge pull request #9022 from eric-wieser/reduce-hides-error
BUG: don't silence __array_wrap__ errors in ufunc.reduce
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/tests/test_ufunclike.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/lib/tests/test_ufunclike.py b/numpy/lib/tests/test_ufunclike.py
index 5604b3744..361367b97 100644
--- a/numpy/lib/tests/test_ufunclike.py
+++ b/numpy/lib/tests/test_ufunclike.py
@@ -52,7 +52,8 @@ class TestUfunclike(object):
return res
def __array_wrap__(self, obj, context=None):
- obj.metadata = self.metadata
+ if isinstance(obj, MyArray):
+ obj.metadata = self.metadata
return obj
def __array_finalize__(self, obj):