changeset: 90491:553fe27521be parent: 90489:925c0b611c02 parent: 90490:6ab3193e890e user: Antoine Pitrou date: Tue Apr 29 01:25:07 2014 +0200 files: Misc/NEWS description: Issue #9815: assertRaises now tries to clear references to local variables in the exception's traceback. diff -r 925c0b611c02 -r 553fe27521be Lib/unittest/case.py --- a/Lib/unittest/case.py Tue Apr 29 00:58:02 2014 +0200 +++ b/Lib/unittest/case.py Tue Apr 29 01:25:07 2014 +0200 @@ -9,6 +9,7 @@ import warnings import collections import contextlib +import traceback from . import result from .util import (strclass, safe_repr, _count_diff_all_purpose, @@ -178,6 +179,8 @@ self.obj_name)) else: self._raiseFailure("{} not raised".format(exc_name)) + else: + traceback.clear_frames(tb) if not issubclass(exc_type, self.expected): # let unexpected exceptions pass through return False diff -r 925c0b611c02 -r 553fe27521be Lib/unittest/test/test_assertions.py --- a/Lib/unittest/test/test_assertions.py Tue Apr 29 00:58:02 2014 +0200 +++ b/Lib/unittest/test/test_assertions.py Tue Apr 29 01:25:07 2014 +0200 @@ -1,5 +1,6 @@ import datetime import warnings +import weakref import unittest from itertools import product @@ -97,6 +98,36 @@ else: self.fail("assertRaises() didn't let exception pass through") + def test_assertRaises_frames_survival(self): + # Issue #9815: assertRaises should avoid keeping local variables + # in a traceback alive. + class A: + pass + wr = None + + class Foo(unittest.TestCase): + + def foo(self): + nonlocal wr + a = A() + wr = weakref.ref(a) + try: + raise IOError + except IOError: + raise ValueError + + def test_functional(self): + self.assertRaises(ValueError, self.foo) + + def test_with(self): + with self.assertRaises(ValueError): + self.foo() + + Foo("test_functional").run() + self.assertIsNone(wr()) + Foo("test_with").run() + self.assertIsNone(wr()) + def testAssertNotRegex(self): self.assertNotRegex('Ala ma kota', r'r+') try: diff -r 925c0b611c02 -r 553fe27521be Misc/NEWS --- a/Misc/NEWS Tue Apr 29 00:58:02 2014 +0200 +++ b/Misc/NEWS Tue Apr 29 01:25:07 2014 +0200 @@ -60,6 +60,9 @@ Library ------- +- Issue #9815: assertRaises now tries to clear references to local variables + in the exception's traceback. + - Issue #19940: ssl.cert_time_to_seconds() now interprets the given time string in the UTC timezone (as specified in RFC 5280), not the local timezone.