Author: Romain Guillebert <[email protected]>
Branch: numpy-pickle
Changeset: r64544:23c18ab3f91b
Date: 2013-05-24 19:03 +0200
http://bitbucket.org/pypy/pypy/changeset/23c18ab3f91b/
Log: Merge default
diff --git a/pypy/module/micronumpy/interp_boxes.py
b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -48,6 +48,15 @@
def __repr__(self):
return '%s(%s)' % (self.__class__.__name__, self.value)
+ def descr_reduce(self, space):
+ numpypy = space.getbuiltinmodule("_numpypy")
+ assert isinstance(numpypy, MixedModule)
+ multiarray = numpypy.get("multiarray")
+ assert isinstance(multiarray, MixedModule)
+ scalar = multiarray.get("scalar")
+
+ return space.newtuple([scalar, space.wrap(self._get_dtype())])
+
class ComplexBox(object):
_mixin_ = True
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
