Issue #23865: close() methods in multiple modules now are idempotent and more
robust at shutdown. If needs to release multiple resources, they are released
even if errors are occured.
diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py
index 340dc51..db185a6 100644
--- a/Lib/xmlrpclib.py
+++ b/Lib/xmlrpclib.py
@@ -558,8 +558,13 @@
self._parser.Parse(data, 0)
def close(self):
- self._parser.Parse("", 1) # end of data
- del self._target, self._parser # get rid of circular references
+ try:
+ parser = self._parser
+ except AttributeError:
+ pass
+ else:
+ del self._target, self._parser # get rid of circular references
+ parser.Parse("", 1) # end of data
class SlowParser:
"""Default XML parser (based on xmllib.XMLParser)."""
@@ -1214,8 +1219,10 @@
gzip.GzipFile.__init__(self, mode="rb", fileobj=self.stringio)
def close(self):
- gzip.GzipFile.close(self)
- self.stringio.close()
+ try:
+ gzip.GzipFile.close(self)
+ finally:
+ self.stringio.close()
# --------------------------------------------------------------------
@@ -1384,9 +1391,10 @@
# Used in the event of socket errors.
#
def close(self):
- if self._connection[1]:
- self._connection[1].close()
+ host, connection = self._connection
+ if connection:
self._connection = (None, None)
+ connection.close()
##
# Send request header.