Author: Romain Guillebert <[email protected]>
Branch: numpypy-array_prepare_-array_wrap
Changeset: r68247:0559ff165dad
Date: 2013-11-19 20:10 +0100
http://bitbucket.org/pypy/pypy/changeset/0559ff165dad/
Log: Forgot to solve this merge conflict
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
@@ -313,9 +313,6 @@
self.w_flags = W_FlagsObject(self)
return self.w_flags
- def descr_dtype(self, space):
- return self._get_dtype(space)
-
class W_BoolBox(W_GenericBox, PrimitiveBox):
descr__new__, _get_dtype, descr_reduce = new_dtype_getter("bool")
@@ -567,9 +564,6 @@
conjugate = interp2app(W_GenericBox.descr_conjugate),
astype = interp2app(W_GenericBox.descr_astype),
view = interp2app(W_GenericBox.descr_view),
-<<<<<<< local
- dtype = GetSetProperty(W_GenericBox.descr_dtype)
-=======
squeeze = interp2app(W_GenericBox.descr_self),
copy = interp2app(W_GenericBox.descr_copy),
@@ -582,7 +576,6 @@
ndim = GetSetProperty(W_GenericBox.descr_get_ndim),
T = GetSetProperty(W_GenericBox.descr_self),
flags = GetSetProperty(W_GenericBox.descr_get_flags),
->>>>>>> other
)
W_BoolBox.typedef = TypeDef("bool_", W_GenericBox.typedef,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
