[pypy-commit] pypy default: make this error message match numpy
bdkearns
noreply at buildbot.pypy.org
Thu Oct 17 23:02:01 CEST 2013
Author: Brian Kearns <bdkearns at gmail.com>
Branch:
Changeset: r67464:b945ca0cf540
Date: 2013-10-17 04:28 -0400
http://bitbucket.org/pypy/pypy/changeset/b945ca0cf540/
Log: make this error message match numpy
diff --git a/pypy/module/micronumpy/interp_arrayops.py b/pypy/module/micronumpy/interp_arrayops.py
--- a/pypy/module/micronumpy/interp_arrayops.py
+++ b/pypy/module/micronumpy/interp_arrayops.py
@@ -117,12 +117,12 @@
shape[i] += axis_size
a_dt = arr.get_dtype()
if dtype.is_record_type() and a_dt.is_record_type():
- #Record types must match
+ # Record types must match
for f in dtype.fields:
if f not in a_dt.fields or \
dtype.fields[f] != a_dt.fields[f]:
raise OperationError(space.w_TypeError,
- space.wrap("record type mismatch"))
+ space.wrap("invalid type promotion"))
elif dtype.is_record_type() or a_dt.is_record_type():
raise OperationError(space.w_TypeError,
space.wrap("invalid type promotion"))
diff --git a/pypy/module/micronumpy/test/test_numarray.py b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -1639,7 +1639,7 @@
exc = raises(TypeError, concatenate,
(zeros((2,), dtype=[('x', int), ('y', float)]),
(zeros((2,), dtype=[('x', float), ('y', float)]))))
- assert str(exc.value).startswith('record type mismatch')
+ assert str(exc.value).startswith('invalid type promotion')
exc = raises(TypeError, concatenate, ([1], zeros((2,),
dtype=[('x', int), ('y', float)])))
assert str(exc.value).startswith('invalid type promotion')
More information about the pypy-commit
mailing list