Issue #808164: Fixed socket.close to avoid references to globals, to
avoid issues when socket.close is called from a __del__ method.
diff --git a/Lib/socket.py b/Lib/socket.py
index 9b4beda..9ed2de9 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -189,7 +189,9 @@
for method in _delegate_methods:
setattr(self, method, getattr(_sock, method))
- def close(self):
+ def close(self, _closedsocket=_closedsocket,
+ _delegate_methods=_delegate_methods, setattr=setattr):
+ # This function should not reference any globals. See issue #808164.
self._sock = _closedsocket()
dummy = self._sock._dummy
for method in _delegate_methods:
diff --git a/Misc/NEWS b/Misc/NEWS
index 1fa1522..31669cf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@
Library
-------
+- Issue #808164: Fixed socket.close to avoid references to globals, to
+ avoid issues when socket.close is called from a __del__ method.
+
- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of
falling into recursion.