Author: Matti Picus <[email protected]>
Branch: cpyext-injection
Changeset: r88368:53bc16aea309
Date: 2016-11-13 22:16 +0200
http://bitbucket.org/pypy/pypy/changeset/53bc16aea309/
Log: fix cut-and-paste typo, XXX mark the next error
diff --git a/pypy/module/cpyext/injection/numpy.py
b/pypy/module/cpyext/injection/numpy.py
--- a/pypy/module/cpyext/injection/numpy.py
+++ b/pypy/module/cpyext/injection/numpy.py
@@ -73,14 +73,16 @@
data1 = rffi.cast(rffi.DOUBLEP, arr1.data)
n1 = arr1.dimensions[0]
else:
+ # XXX this should be a pointer to a float, not a list
data1 = [space.float_w(w_self),]
n1 = 1
if isinstance(w_other, W_ArrayObject):
- arr2 = rffi.cast(PyArrayObject, w_self.pyobj)
+ arr2 = rffi.cast(PyArrayObject, w_other.pyobj)
data2 = rffi.cast(rffi.DOUBLEP, arr2.data)
n2 = arr2.dimensions[0]
else:
- data2 = [space.int_w(w_other),]
+ # XXX this should be a pointer to a float, not a list
+ data2 = [space.float_w(w_other),]
n2 = 1
if not (n1 == n2 or n1 == 1 or n2 == 1):
raise oefmt(space.w_ValueError, 'dimension mismatch')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
