Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3k
Changeset: r86940:aa12ac889991
Date: 2016-09-07 15:50 +0100
http://bitbucket.org/pypy/pypy/changeset/aa12ac889991/
Log: 2to3fy cpyext's test_memoryobject.py
diff --git a/pypy/module/cpyext/test/buffer_test.c
b/pypy/module/cpyext/test/buffer_test.c
--- a/pypy/module/cpyext/test/buffer_test.c
+++ b/pypy/module/cpyext/test/buffer_test.c
@@ -192,10 +192,10 @@
PyObject* obj = PyTuple_GetItem(args, 0);
PyObject* memoryview = PyMemoryView_FromObject(obj);
if (memoryview == NULL)
- return PyInt_FromLong(-1);
+ return PyLong_FromLong(-1);
view = PyMemoryView_GET_BUFFER(memoryview);
Py_DECREF(memoryview);
- return PyInt_FromLong(view->len);
+ return PyLong_FromLong(view->len);
}
/* Copied from numpy tests */
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
@@ -1,6 +1,8 @@
+import pytest
from pypy.module.cpyext.test.test_api import BaseApiTest
from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
from rpython.rlib.buffer import StringBuffer
+
class TestMemoryViewObject(BaseApiTest):
def test_fromobject(self, space, api):
w_hello = space.newbytes("hello")
@@ -76,6 +78,7 @@
viewlen = module.test_buffer(arr)
assert viewlen == y.itemsize * len(y)
+ @pytest.mark.skipif(True, reason="no _numpypy on py3k")
def test_buffer_info(self):
from _numpypy import multiarray as np
module = self.import_module(name='buffer_test')
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
