From: Victor Stinner <vstinner@redhat.com>
Date: Tue, 11 Jun 2019 00:49:06 +0000 (+0200)
Subject: bpo-18748: Fix _pyio.IOBase destructor (closed case) (GH-13952)
X-Git-Tag: v3.9.0a1~1331
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f6f7c5a611905fb6b81671547f268c226bc646a;p=thirdparty%2FPython%2Fcpython.git

bpo-18748: Fix _pyio.IOBase destructor (closed case) (GH-13952)

_pyio.IOBase destructor now does nothing if getting the closed
attribute fails to better mimick _io.IOBase finalizer.
---

diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index 43c24342ad61..0b6493bc8dc9 100644
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -405,6 +405,16 @@ class IOBase(metaclass=abc.ABCMeta):
 
     def __del__(self):
         """Destructor.  Calls close()."""
+        try:
+            closed = self.closed
+        except Exception:
+            # If getting closed fails, then the object is probably
+            # in an unusable state, so ignore.
+            return
+
+        if closed:
+            return
+
         if _IOBASE_EMITS_UNRAISABLE:
             self.close()
         else:
diff --git a/Misc/NEWS.d/next/Library/2019-06-11-01-54-19.bpo-18748.ADqCkq.rst b/Misc/NEWS.d/next/Library/2019-06-11-01-54-19.bpo-18748.ADqCkq.rst
new file mode 100644
index 000000000000..295ddebb2a40
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-11-01-54-19.bpo-18748.ADqCkq.rst
@@ -0,0 +1,2 @@
+:class:`_pyio.IOBase` destructor now does nothing if getting the ``closed``
+attribute fails to better mimick :class:`_io.IOBase` finalizer.