[pypy-commit] pypy py3k: this workaround is now disabled and seemingly no longer necessary

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r84611:02818992e583
Date: 2016-05-22 17:29 -0700
http://bitbucket.org/pypy/pypy/changeset/02818992e583/

Log:	this workaround is now disabled and seemingly no longer necessary

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -185,29 +185,7 @@
     __multicall__.execute()
 
 def pytest_runtest_teardown(__multicall__, item):
-    user_del_action = None
-    if isinstance(item, py.test.collect.Function):
-        appclass = item.getparent(PyPyClassCollector)
-        if (appclass is not None and
-            not getattr(appclass.obj, 'runappdirect', False) and
-            hasattr(appclass.obj, 'space')):
-            user_del_action = appclass.obj.space.user_del_action
-
-    if user_del_action:
-        # if leakfinder triggers leftover __del__s, ensure their
-        # enqueue_for_destruction callbacks are invoked immediately
-        # instead of scheduled for later (potentially never)
-        user_del_action._invoke_immediately = True
-    try:
-        # leakfinder
-        __multicall__.execute()
-    finally:
-        if user_del_action:
-            user_del_action._invoke_immediately = False
-
-    if 'pygame' in sys.modules:
-        assert option.view, ("should not invoke Pygame "
-                             "if conftest.option.view is False")
+    __multicall__.execute()
 
 
 class PyPyClassCollector(py.test.collect.Class):