bpo-31787: Prevent refleaks when calling __init__() more than once (GH-3995)
(cherry picked from commit d019bc8319ea35e93bf4baa38098ff1b57cd3ee5)
Co-authored-by: Oren Milman <orenmn@gmail.com>
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 19cf1e6..e5334c6 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -2373,6 +2373,20 @@
Task = getattr(tasks, '_CTask', None)
Future = getattr(futures, '_CFuture', None)
+ @support.refcount_test
+ def test_refleaks_in_task___init__(self):
+ gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
+ @asyncio.coroutine
+ def coro():
+ pass
+ task = self.new_task(self.loop, coro())
+ self.loop.run_until_complete(task)
+ refs_before = gettotalrefcount()
+ for i in range(100):
+ task.__init__(coro(), loop=self.loop)
+ self.loop.run_until_complete(task)
+ self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
+
@unittest.skipUnless(hasattr(futures, '_CFuture') and
hasattr(tasks, '_CTask'),
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
index 58abdc1..003497f 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -13,6 +13,7 @@
import threading
from test.support import unlink
import _compression
+import sys
# Skip tests if the bz2 module doesn't exist.
@@ -816,6 +817,16 @@
# Previously, a second call could crash due to internal inconsistency
self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30)
+ @support.refcount_test
+ def test_refleaks_in___init__(self):
+ gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
+ bzd = BZ2Decompressor()
+ refs_before = gettotalrefcount()
+ for i in range(100):
+ bzd.__init__()
+ self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
+
+
class CompressDecompressTest(BaseTest):
def testCompress(self):
data = bz2.compress(self.TEXT)
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index d24d005..0e7728e 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1559,6 +1559,15 @@
del cm.x
self.assertNotHasAttr(cm, "x")
+ @support.refcount_test
+ def test_refleaks_in_classmethod___init__(self):
+ gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
+ cm = classmethod(None)
+ refs_before = gettotalrefcount()
+ for i in range(100):
+ cm.__init__(None)
+ self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
+
@support.impl_detail("the module 'xxsubtype' is internal")
def test_classmethods_in_c(self):
# Testing C-based class methods...
@@ -1614,6 +1623,15 @@
del sm.x
self.assertNotHasAttr(sm, "x")
+ @support.refcount_test
+ def test_refleaks_in_staticmethod___init__(self):
+ gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
+ sm = staticmethod(None)
+ refs_before = gettotalrefcount()
+ for i in range(100):
+ sm.__init__(None)
+ self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
+
@support.impl_detail("the module 'xxsubtype' is internal")
def test_staticmethods_in_c(self):
# Testing C-based static methods...
diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py
index 751f748..f7df872 100644
--- a/Lib/test/test_hashlib.py
+++ b/Lib/test/test_hashlib.py
@@ -162,6 +162,15 @@
constructors = self.constructors_to_test.values()
return itertools.chain.from_iterable(constructors)
+ @support.refcount_test
+ def test_refleaks_in_hash___init__(self):
+ gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
+ sha1_hash = c_hashlib.new('sha1')
+ refs_before = gettotalrefcount()
+ for i in range(100):
+ sha1_hash.__init__('sha1')
+ self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
+
def test_hash_array(self):
a = array.array("b", range(10))
for cons in self.hash_constructors:
diff --git a/Lib/test/test_lzma.py b/Lib/test/test_lzma.py
index d7a8576..3dc2c1e 100644
--- a/Lib/test/test_lzma.py
+++ b/Lib/test/test_lzma.py
@@ -4,6 +4,8 @@
import pathlib
import pickle
import random
+import sys
+from test import support
import unittest
from test.support import (
@@ -364,6 +366,15 @@
with self.assertRaises(TypeError):
pickle.dumps(LZMADecompressor(), proto)
+ @support.refcount_test
+ def test_refleaks_in_decompressor___init__(self):
+ gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
+ lzd = LZMADecompressor()
+ refs_before = gettotalrefcount()
+ for i in range(100):
+ lzd.__init__()
+ self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
+
class CompressDecompressFunctionTestCase(unittest.TestCase):
diff --git a/Lib/test/test_property.py b/Lib/test/test_property.py
index 26b7d52..f6f8f5e 100644
--- a/Lib/test/test_property.py
+++ b/Lib/test/test_property.py
@@ -3,6 +3,7 @@
import sys
import unittest
+from test import support
class PropertyBase(Exception):
pass
@@ -173,6 +174,16 @@
sub.__class__.spam.__doc__ = 'Spam'
self.assertEqual(sub.__class__.spam.__doc__, 'Spam')
+ @support.refcount_test
+ def test_refleaks_in___init__(self):
+ gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
+ fake_prop = property('fget', 'fset', 'fdel', 'doc')
+ refs_before = gettotalrefcount()
+ for i in range(100):
+ fake_prop.__init__('fget', 'fset', 'fdel', 'doc')
+ self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
+
+
# Issue 5890: subclasses of property do not preserve method __doc__ strings
class PropertySub(property):
"""This is a subclass of property"""