Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: apptest-file
Changeset: r95289:b41d84cd81ea
Date: 2018-11-10 14:51 +0000
http://bitbucket.org/pypy/pypy/changeset/b41d84cd81ea/
Log: fix import order issues in cpyext tests
diff --git a/pypy/module/cpyext/object.py b/pypy/module/cpyext/object.py
--- a/pypy/module/cpyext/object.py
+++ b/pypy/module/cpyext/object.py
@@ -7,7 +7,6 @@
from pypy.module.cpyext.pyobject import (
PyObject, PyObjectP, from_ref, incref, decref,
get_typedescr, hack_for_result_often_existing_obj)
-from pypy.module.cpyext.typeobject import PyTypeObjectPtr
from pypy.module.cpyext.pyerrors import PyErr_NoMemory, PyErr_BadInternalCall
from pypy.objspace.std.typeobject import W_TypeObject
from pypy.interpreter.error import OperationError, oefmt
@@ -264,7 +263,7 @@
if opid == Py_EQ:
return 1
if opid == Py_NE:
- return 0
+ return 0
w_res = PyObject_RichCompare(space, w_o1, w_o2, opid_int)
return int(space.is_true(w_res))
diff --git a/pypy/module/cpyext/test/test_classobject.py
b/pypy/module/cpyext/test/test_classobject.py
--- a/pypy/module/cpyext/test/test_classobject.py
+++ b/pypy/module/cpyext/test/test_classobject.py
@@ -1,5 +1,4 @@
from pypy.interpreter.function import Function
-import pypy.module.cpyext.moduledef # XXX: avoids a weird import cycle issue
from pypy.module.cpyext.test.test_api import BaseApiTest
from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
from pypy.module.cpyext.classobject import (
diff --git a/pypy/module/cpyext/test/test_cpyext.py
b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -14,6 +14,8 @@
from rpython.rlib import rawrefcount
from rpython.tool.udir import udir
+import pypy.module.cpyext.moduledef # Make sure all the functions are
registered
+
only_pypy ="config.option.runappdirect and '__pypy__' not in
sys.builtin_module_names"
@api.cpython_api([], api.PyObject)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
