Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67844:53130555bf48
Date: 2013-11-04 22:32 -0500
http://bitbucket.org/pypy/pypy/changeset/53130555bf48/
Log: provide scalar.{strides,T}
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
@@ -265,7 +265,7 @@
raise OperationError(space.w_NotImplementedError, space.wrap(
"view not implelemnted yet"))
- def descr_squeeze(self):
+ def descr_self(self, space):
return self
def descr_get_dtype(self, space):
@@ -527,13 +527,15 @@
conjugate = interp2app(W_GenericBox.descr_conjugate),
astype = interp2app(W_GenericBox.descr_astype),
view = interp2app(W_GenericBox.descr_view),
- squeeze = interp2app(W_GenericBox.descr_squeeze),
+ squeeze = interp2app(W_GenericBox.descr_self),
dtype = GetSetProperty(W_GenericBox.descr_get_dtype),
itemsize = GetSetProperty(W_GenericBox.descr_get_itemsize),
nbytes = GetSetProperty(W_GenericBox.descr_get_itemsize),
shape = GetSetProperty(W_GenericBox.descr_get_shape),
+ strides = GetSetProperty(W_GenericBox.descr_get_shape),
ndim = GetSetProperty(W_GenericBox.descr_get_ndim),
+ T = GetSetProperty(W_GenericBox.descr_self),
)
W_BoolBox.typedef = TypeDef("bool_", W_GenericBox.typedef,
diff --git a/pypy/module/micronumpy/test/test_scalar.py
b/pypy/module/micronumpy/test/test_scalar.py
--- a/pypy/module/micronumpy/test/test_scalar.py
+++ b/pypy/module/micronumpy/test/test_scalar.py
@@ -79,7 +79,9 @@
assert value.itemsize == 8
assert value.nbytes == 8
assert value.shape == ()
+ assert value.strides == ()
assert value.ndim == 0
+ assert value.T is value
def test_complex_scalar_complex_cast(self):
import numpy as np
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
