Author: mattip <[email protected]>
Branch:
Changeset: r63349:30d046ac6116
Date: 2013-04-15 00:35 +0300
http://bitbucket.org/pypy/pypy/changeset/30d046ac6116/
Log: fix wrong type in error message (amaury, arigato)
diff --git a/pypy/module/micronumpy/interp_dtype.py
b/pypy/module/micronumpy/interp_dtype.py
--- a/pypy/module/micronumpy/interp_dtype.py
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -282,7 +282,10 @@
return dtype
if w_dtype is dtype.w_box_type:
return dtype
- raise OperationError(space.w_TypeError, space.wrap("data type %r not
understood" % w_dtype))
+ typename = space.type(w_dtype).getname(space)
+ raise OperationError(space.w_TypeError, space.wrap(
+ "data type not understood (value of type " +
+ "%s not expected here)" % typename))
W_Dtype.typedef = TypeDef("dtype",
__module__ = "numpypy",
diff --git a/pypy/module/micronumpy/test/test_dtypes.py
b/pypy/module/micronumpy/test/test_dtypes.py
--- a/pypy/module/micronumpy/test/test_dtypes.py
+++ b/pypy/module/micronumpy/test/test_dtypes.py
@@ -32,7 +32,8 @@
assert dtype(None) is dtype(float)
- raises(TypeError, dtype, 1042)
+ exc = raises(TypeError, dtype, (1, 2))
+ assert 'data type not understood' in str(exc.value)
raises(KeyError, 'dtype(int)["asdasd"]')
def test_dtype_eq(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
