Author: mattip <matti.pi...@gmail.com>
Branch:
Changeset: r75137:2d5abc45da13
Date: 2014-12-29 21:30 +0200
http://bitbucket.org/pypy/pypy/changeset/2d5abc45da13/
Log: trivial numpy error message compatibility
diff --git a/pypy/module/micronumpy/descriptor.py
b/pypy/module/micronumpy/descriptor.py
--- a/pypy/module/micronumpy/descriptor.py
+++ b/pypy/module/micronumpy/descriptor.py
@@ -392,7 +392,7 @@
alignment = space.int_w(space.getitem(w_data, space.wrap(6)))
if (w_names == space.w_None) != (w_fields == space.w_None):
- raise oefmt(space.w_ValueError, "inconsistent fields and names")
+ raise oefmt(space.w_ValueError, "inconsistent fields and names in
Numpy dtype unpickling")
self.byteorder = endian
self.shape = []
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
@@ -1234,7 +1234,8 @@
d = np.dtype(('<f8', 2))
exc = raises(ValueError, "d.__setstate__((3, '|', None, ('f0', 'f1'),
None, 16, 1, 0))")
- assert exc.value[0] == 'inconsistent fields and names'
+ inconsistent = 'inconsistent fields and names in Numpy dtype
unpickling'
+ assert exc.value[0] == inconsistent
assert d.fields is None
assert d.shape == (2,)
assert d.subdtype is not None
@@ -1242,7 +1243,7 @@
d = np.dtype(('<f8', 2))
exc = raises(ValueError, "d.__setstate__((3, '|', None, None, {'f0':
(np.dtype('float64'), 0), 'f1': (np.dtype('float64'), 8)}, 16, 1, 0))")
- assert exc.value[0] == 'inconsistent fields and names'
+ assert exc.value[0] == inconsistent
assert d.fields is None
assert d.shape == (2,)
assert d.subdtype is not None
@@ -1283,7 +1284,11 @@
from cPickle import loads, dumps
d = dtype([("x", "int32"), ("y", "int32"), ("z", "int32"), ("value",
float)])
- assert d.__reduce__() == (dtype, ('V20', 0, 1), (3, '|', None, ('x',
'y', 'z', 'value'), {'y': (dtype('int32'), 4), 'x': (dtype('int32'), 0), 'z':
(dtype('int32'), 8), 'value': (dtype('float64'), 12)}, 20, 1, 0))
+ assert d.__reduce__() == (dtype, ('V20', 0, 1), (3, '|', None,
+ ('x', 'y', 'z', 'value'),
+ {'y': (dtype('int32'), 4), 'x': (dtype('int32'), 0),
+ 'z': (dtype('int32'), 8), 'value': (dtype('float64'),
12),
+ }, 20, 1, 0))
new_d = loads(dumps(d))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
