Author: Ronan Lamy <[email protected]>
Branch:
Changeset: r85298:c58bfb70bcbb
Date: 2016-06-21 04:15 +0100
http://bitbucket.org/pypy/pypy/changeset/c58bfb70bcbb/
Log: fix sys imports
diff --git a/pypy/module/cpyext/test/test_bytearrayobject.py
b/pypy/module/cpyext/test/test_bytearrayobject.py
--- a/pypy/module/cpyext/test/test_bytearrayobject.py
+++ b/pypy/module/cpyext/test/test_bytearrayobject.py
@@ -1,6 +1,5 @@
from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
-import sys
class AppTestStringObject(AppTestCpythonExtensionBase):
def test_basic(self):
@@ -33,7 +32,7 @@
if(s->ob_type->tp_basicsize != expected_size)
{
printf("tp_basicsize==%ld\\n",
- (long)s->ob_type->tp_basicsize);
+ (long)s->ob_type->tp_basicsize);
result = 0;
}
Py_DECREF(s);
@@ -90,7 +89,7 @@
base = PyByteArray_FromStringAndSize("test", 10);
if (PyByteArray_GET_SIZE(base) != 10)
return PyLong_FromLong(-PyByteArray_GET_SIZE(base));
- memcpy(PyByteArray_AS_STRING(base), "works", 6);
+ memcpy(PyByteArray_AS_STRING(base), "works", 6);
Py_INCREF(base);
return base;
"""),
@@ -117,6 +116,7 @@
assert s == 'test'
def test_manipulations(self):
+ import sys
module = self.import_extension('foo', [
("bytearray_from_string", "METH_VARARGS",
'''
@@ -143,9 +143,9 @@
("concat", "METH_VARARGS",
"""
PyObject * ret, *right, *left;
- PyObject *ba1, *ba2;
+ PyObject *ba1, *ba2;
if (!PyArg_ParseTuple(args, "OO", &left, &right)) {
- return PyString_FromString("parse failed");
+ return PyString_FromString("parse failed");
}
ba1 = PyByteArray_FromObject(left);
ba2 = PyByteArray_FromObject(right);
@@ -175,9 +175,9 @@
PyObject *obj, *ba;
int newsize, oldsize, ret;
if (!PyArg_ParseTuple(args, "Oi", &obj, &newsize)) {
- return PyString_FromString("parse failed");
+ return PyString_FromString("parse failed");
}
-
+
ba = PyByteArray_FromObject(obj);
if (ba == NULL)
return NULL;
@@ -191,7 +191,7 @@
{
printf("ret, oldsize, newsize= %d, %d, %d\\n", ret, oldsize,
newsize);
return NULL;
- }
+ }
return ba;
'''
)])
diff --git a/pypy/module/cpyext/test/test_typeobject.py
b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -5,8 +5,6 @@
from pypy.module.cpyext.pyobject import make_ref, from_ref
from pypy.module.cpyext.typeobject import PyTypeObjectPtr
-import sys
-
class AppTestTypeObject(AppTestCpythonExtensionBase):
def test_typeobject(self):
import sys
@@ -897,6 +895,7 @@
module.footype("X", (object,), {})
def test_app_subclass_of_c_type(self):
+ import sys
module = self.import_module(name='foo')
size = module.size_of_instances(module.fooType)
class f1(object):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
