Issue #808164: Fixed socket.close to avoid references to globals, to

avoid issues when socket.close is called from a __del__ method.

2 files changed, 6 insertions, 1 deletions

diff --git a/Lib/socket.py b/Lib/socket.py
index 9b4bedaafb..9ed2de9132 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -189,7 +189,9 @@ class _socketobject(object):
         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 1fa15224e2..31669cf1a9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@ Core and Builtins
 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.