Kaydet (Commit) 8f2b6ad9 authored tarafından Philip Jenvey's avatar Philip Jenvey

merge 3.3

...@@ -7,8 +7,9 @@ import pickle ...@@ -7,8 +7,9 @@ import pickle
import weakref import weakref
import errno import errno
from test.support import (TESTFN, unlink, run_unittest, captured_output, from test.support import (TESTFN, captured_output, check_impl_detail,
check_warnings, gc_collect, cpython_only, no_tracing) check_warnings, cpython_only, gc_collect, run_unittest,
no_tracing, unlink)
class NaiveException(Exception): class NaiveException(Exception):
def __init__(self, x): def __init__(self, x):
...@@ -551,7 +552,9 @@ class ExceptionTests(unittest.TestCase): ...@@ -551,7 +552,9 @@ class ExceptionTests(unittest.TestCase):
e.__context__ = None e.__context__ = None
obj = None obj = None
obj = wr() obj = wr()
gc_collect() # guarantee no ref cycles on CPython (don't gc_collect)
if check_impl_detail(cpython=False):
gc_collect()
self.assertTrue(obj is None, "%s" % obj) self.assertTrue(obj is None, "%s" % obj)
# Some complicated construct # Some complicated construct
...@@ -568,7 +571,8 @@ class ExceptionTests(unittest.TestCase): ...@@ -568,7 +571,8 @@ class ExceptionTests(unittest.TestCase):
except MyException: except MyException:
pass pass
obj = None obj = None
gc_collect() if check_impl_detail(cpython=False):
gc_collect()
obj = wr() obj = wr()
self.assertTrue(obj is None, "%s" % obj) self.assertTrue(obj is None, "%s" % obj)
...@@ -583,7 +587,8 @@ class ExceptionTests(unittest.TestCase): ...@@ -583,7 +587,8 @@ class ExceptionTests(unittest.TestCase):
with Context(): with Context():
inner_raising_func() inner_raising_func()
obj = None obj = None
gc_collect() if check_impl_detail(cpython=False):
gc_collect()
obj = wr() obj = wr()
self.assertTrue(obj is None, "%s" % obj) self.assertTrue(obj is None, "%s" % obj)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment