Author: Matti Picus <[email protected]>
Branch: cpyext-from2
Changeset: r89391:14fae6e9cb91
Date: 2017-01-06 14:30 +0200
http://bitbucket.org/pypy/pypy/changeset/14fae6e9cb91/
Log: fix tests, add result_is_ll
diff --git a/pypy/module/cpyext/memoryobject.py
b/pypy/module/cpyext/memoryobject.py
--- a/pypy/module/cpyext/memoryobject.py
+++ b/pypy/module/cpyext/memoryobject.py
@@ -201,7 +201,7 @@
return (_IsCContiguous(view) or _IsFortranContiguous(view))
return 0
-@cpython_api([PyObject], PyObject)
+@cpython_api([PyObject], PyObject, result_is_ll=True)
def PyMemoryView_FromObject(space, w_obj):
w_memview = space.call_method(space.builtin, "memoryview", w_obj)
py_memview = make_ref(space, w_memview, w_obj)
diff --git a/pypy/module/cpyext/test/test_memoryobject.py
b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -4,6 +4,7 @@
from pypy.module.cpyext.test.test_api import BaseApiTest
from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
from rpython.rlib.buffer import StringBuffer
+from pypy.module.cpyext.pyobject import from_ref
only_pypy ="config.option.runappdirect and '__pypy__' not in
sys.builtin_module_names"
@@ -11,7 +12,7 @@
def test_fromobject(self, space, api):
w_hello = space.newbytes("hello")
assert api.PyObject_CheckBuffer(w_hello)
- w_view = api.PyMemoryView_FromObject(w_hello)
+ w_view = from_ref(space, api.PyMemoryView_FromObject(w_hello))
w_char = space.call_method(w_view, '__getitem__', space.wrap(0))
assert space.eq_w(w_char, space.wrap('h'))
w_bytes = space.call_method(w_view, "tobytes")
@@ -19,7 +20,7 @@
def test_frombuffer(self, space, api):
w_buf = space.newbuffer(StringBuffer("hello"))
- w_memoryview = api.PyMemoryView_FromObject(w_buf)
+ w_memoryview = from_ref(space, api.PyMemoryView_FromObject(w_buf))
view = api.PyMemoryView_GET_BUFFER(w_memoryview)
assert view.c_ndim == 1
f = rffi.charp2str(view.c_format)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
