[Python-checkins] cpython (3.5): Issue #25455: Clean up reference loops created in tests for recursive

Sun Jun 12 08:53:31 EDT 2016

https://hg.python.org/cpython/rev/0323b33894f2
changeset: 101944:0323b33894f2
branch: 3.5
parent: 101940:12bf71b9f1cd
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Jun 12 15:45:14 2016 +0300
summary:
 Issue #25455: Clean up reference loops created in tests for recursive
functools.partial objects.
files:
 Lib/test/test_functools.py | 48 +++++++++++++++++++------
 1 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -225,15 +225,24 @@
 
 f = self.partial(capture)
 f.__setstate__((f, (), {}, {}))
- self.assertEqual(repr(f), '%s(%s(...))' % (name, name))
+ try:
+ self.assertEqual(repr(f), '%s(%s(...))' % (name, name))
+ finally:
+ f.__setstate__((capture, (), {}, {}))
 
 f = self.partial(capture)
 f.__setstate__((capture, (f,), {}, {}))
- self.assertEqual(repr(f), '%s(%r, %s(...))' % (name, capture, name))
+ try:
+ self.assertEqual(repr(f), '%s(%r, %s(...))' % (name, capture, name))
+ finally:
+ f.__setstate__((capture, (), {}, {}))
 
 f = self.partial(capture)
 f.__setstate__((capture, (), {'a': f}, {}))
- self.assertEqual(repr(f), '%s(%r, a=%s(...))' % (name, capture, name))
+ try:
+ self.assertEqual(repr(f), '%s(%r, a=%s(...))' % (name, capture, name))
+ finally:
+ f.__setstate__((capture, (), {}, {}))
 
 def test_pickle(self):
 f = self.partial(signature, ['asdf'], bar=[True])
@@ -318,21 +327,36 @@
 def test_recursive_pickle(self):
 f = self.partial(capture)
 f.__setstate__((f, (), {}, {}))
- for proto in range(pickle.HIGHEST_PROTOCOL + 1):
- with self.assertRaises(RecursionError):
- pickle.dumps(f, proto)
+ try:
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ with self.assertRaises(RecursionError):
+ pickle.dumps(f, proto)
+ finally:
+ f.__setstate__((capture, (), {}, {}))
 
 f = self.partial(capture)
 f.__setstate__((capture, (f,), {}, {}))
- for proto in range(pickle.HIGHEST_PROTOCOL + 1):
- f_copy = pickle.loads(pickle.dumps(f, proto))
- self.assertIs(f_copy.args[0], f_copy)
+ try:
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ f_copy = pickle.loads(pickle.dumps(f, proto))
+ try:
+ self.assertIs(f_copy.args[0], f_copy)
+ finally:
+ f_copy.__setstate__((capture, (), {}, {}))
+ finally:
+ f.__setstate__((capture, (), {}, {}))
 
 f = self.partial(capture)
 f.__setstate__((capture, (), {'a': f}, {}))
- for proto in range(pickle.HIGHEST_PROTOCOL + 1):
- f_copy = pickle.loads(pickle.dumps(f, proto))
- self.assertIs(f_copy.keywords['a'], f_copy)
+ try:
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ f_copy = pickle.loads(pickle.dumps(f, proto))
+ try:
+ self.assertIs(f_copy.keywords['a'], f_copy)
+ finally:
+ f_copy.__setstate__((capture, (), {}, {}))
+ finally:
+ f.__setstate__((capture, (), {}, {}))
 
 # Issue 6083: Reference counting bug
 def test_setstate_refcount(self):
-- 
Repository URL: https://hg.python.org/cpython
