changeset:   92646:e54da75100f6
branch:      3.4
parent:      92641:158127da99ac
parent:      92645:e834b32f0422
user:        Benjamin Peterson <benjamin@python.org>
date:        Mon Sep 29 22:48:51 2014 -0400
files:       Lib/test/test_io.py Misc/NEWS Modules/_io/bufferedio.c
description:
merge 3.3 (#22517)


diff -r 158127da99ac -r e54da75100f6 Lib/test/test_io.py
--- a/Lib/test/test_io.py	Mon Sep 29 19:12:37 2014 -0400
+++ b/Lib/test/test_io.py	Mon Sep 29 22:48:51 2014 -0400
@@ -1567,6 +1567,12 @@
         pair = self.tp(SelectableIsAtty(True), SelectableIsAtty(True))
         self.assertTrue(pair.isatty())
 
+    def test_weakref_clearing(self):
+        brw = self.tp(self.MockRawIO(), self.MockRawIO())
+        ref = weakref.ref(brw)
+        brw = None
+        ref = None # Shouldn't segfault.
+
 class CBufferedRWPairTest(BufferedRWPairTest):
     tp = io.BufferedRWPair
 
diff -r 158127da99ac -r e54da75100f6 Misc/NEWS
--- a/Misc/NEWS	Mon Sep 29 19:12:37 2014 -0400
+++ b/Misc/NEWS	Mon Sep 29 22:48:51 2014 -0400
@@ -16,6 +16,9 @@
 Library
 -------
 
+- Issue #22517: When a io.BufferedRWPair object is deallocated, clear its
+  weakrefs.
+
 - Issue #22448: Improve canceled timer handles cleanup to prevent
   unbound memory usage. Patch by Joshua Moore-Oliva.
 
diff -r 158127da99ac -r e54da75100f6 Modules/_io/bufferedio.c
--- a/Modules/_io/bufferedio.c	Mon Sep 29 19:12:37 2014 -0400
+++ b/Modules/_io/bufferedio.c	Mon Sep 29 22:48:51 2014 -0400
@@ -2297,6 +2297,8 @@
 bufferedrwpair_dealloc(rwpair *self)
 {
     _PyObject_GC_UNTRACK(self);
+    if (self->weakreflist != NULL)
+        PyObject_ClearWeakRefs((PyObject *)self);
     Py_CLEAR(self->reader);
     Py_CLEAR(self->writer);
     Py_CLEAR(self->dict);