Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.5
Changeset: r94388:a5488a8c8485
Date: 2018-04-19 23:41 +0300
http://bitbucket.org/pypy/pypy/changeset/a5488a8c8485/
Log: merge default into branch
diff --git a/pypy/module/cpyext/test/test_arraymodule.py
b/pypy/module/cpyext/test/test_arraymodule.py
--- a/pypy/module/cpyext/test/test_arraymodule.py
+++ b/pypy/module/cpyext/test/test_arraymodule.py
@@ -187,7 +187,4 @@
self.attrib = True
import gc
module.subclass_with_attribute(Sub, "addattrib", "attrib", gc.collect)
- if self.runappdirect:
- assert Sub.__module__ == 'pypy.module.cpyext.test.test_arraymodule'
- assert str(Sub) == "<class
'pypy.module.cpyext.test.test_arraymodule.Sub'>"
-
+ assert Sub.__module__ == __name__
diff --git a/pypy/module/cpyext/test/test_unicodeobject.py
b/pypy/module/cpyext/test/test_unicodeobject.py
--- a/pypy/module/cpyext/test/test_unicodeobject.py
+++ b/pypy/module/cpyext/test/test_unicodeobject.py
@@ -27,11 +27,8 @@
if(PyUnicode_GetSize(s) != 11) {
result = -PyUnicode_GetSize(s);
}
-#ifdef PYPY_VERSION
- // Slightly silly test that tp_basicsize is reasonable.
- if(s->ob_type->tp_basicsize != sizeof(void*)*12)
+ if(s->ob_type->tp_basicsize != sizeof(PyUnicodeObject))
result = s->ob_type->tp_basicsize;
-#endif // PYPY_VERSION
Py_DECREF(s);
return PyLong_FromLong(result);
"""),
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
