summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorDaniel Stutzbach <daniel@stutzbachenterprises.com>2010-08-31 20:08:07 (GMT)
committerDaniel Stutzbach <daniel@stutzbachenterprises.com>2010-08-31 20:08:07 (GMT)
commit19d6a4fd4974a0536a02c93a0dc878194a1d4691 (patch)
treeeddd00809d7cbadfb218b55c441a8e33a650f5b4 /Lib
parenta606faa491af05b99dba6ebafa57662cf6b451fe (diff)
downloadcpython-19d6a4fd4974a0536a02c93a0dc878194a1d4691.zip
cpython-19d6a4fd4974a0536a02c93a0dc878194a1d4691.tar.gz
cpython-19d6a4fd4974a0536a02c93a0dc878194a1d4691.tar.bz2
Issue #808164: Fixed socket.close to avoid references to globals, to
avoid issues when socket.close is called from a __del__ method.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/socket.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/socket.py b/Lib/socket.py
index 7818875..30a01aa 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -172,10 +172,12 @@ class socket(_socket.socket):
if self._closed:
self.close()
- def _real_close(self):
- _socket.socket.close(self)
+ def _real_close(self, _ss=_socket.socket):
+ # This function should not reference any globals. See Issue808164
+ _ss.close(self)
def close(self):
+ # This function should not reference any globals. See Issue808164
self._closed = True
if self._io_refs <= 0:
self._real_close()