allow cycles throught the __dict__ slot to be cleared (closes #1469629)
Patch from Armin, test from me.
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 92304b4..4aeb77f 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1,8 +1,10 @@
import builtins
+import gc
import sys
import types
import math
import unittest
+import weakref
from copy import deepcopy
from test import support
@@ -1186,7 +1188,6 @@
self.assertEqual(Counted.counter, 0)
# Test lookup leaks [SF bug 572567]
- import gc
if hasattr(gc, 'get_objects'):
class G(object):
def __eq__(self, other):
@@ -4380,7 +4381,6 @@
self.assertRaises(AttributeError, getattr, C(), "attr")
self.assertEqual(descr.counter, 4)
- import gc
class EvilGetattribute(object):
# This used to segfault
def __getattr__(self, name):
@@ -4429,6 +4429,21 @@
foo = Foo()
str(foo)
+ def test_cycle_through_dict(self):
+ # See bug #1469629
+ class X(dict):
+ def __init__(self):
+ dict.__init__(self)
+ self.__dict__ = self
+ x = X()
+ x.attr = 42
+ wr = weakref.ref(x)
+ del x
+ support.gc_collect()
+ self.assertIsNone(wr())
+ for o in gc.get_objects():
+ self.assertIsNot(type(o), X)
+
class DictProxyTests(unittest.TestCase):
def setUp(self):
class C(object):