Author: Brian Kearns <[email protected]>
Branch:
Changeset: r68978:3528431821e9
Date: 2014-01-28 13:54 -0500
http://bitbucket.org/pypy/pypy/changeset/3528431821e9/
Log: fix outer exception to match numpy
diff --git a/pypy/module/micronumpy/interp_ufuncs.py
b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -258,7 +258,7 @@
return self._outer(space, __args__)
def _outer(self, space, __args__):
- raise OperationError(space.w_TypeError,
+ raise OperationError(space.w_ValueError,
space.wrap("outer product only supported for
binary functions"))
class W_Ufunc1(W_Ufunc):
diff --git a/pypy/module/micronumpy/test/test_ufuncs.py
b/pypy/module/micronumpy/test/test_ufuncs.py
--- a/pypy/module/micronumpy/test/test_ufuncs.py
+++ b/pypy/module/micronumpy/test/test_ufuncs.py
@@ -1056,4 +1056,5 @@
def test_outer(self):
import numpy as np
from numpypy import absolute
- assert raises(TypeError, np.absolute.outer, [-1, -2])
+ exc = raises(ValueError, np.absolute.outer, [-1, -2])
+ assert exc.value[0] == 'outer product only supported for binary
functions'
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit