diff options
| -rw-r--r-- | Lib/httplib.py | 4 | ||||
| -rw-r--r-- | Lib/socket.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Lib/httplib.py b/Lib/httplib.py index 4797e03..213d80c 100644 --- a/Lib/httplib.py +++ b/Lib/httplib.py @@ -948,8 +948,8 @@ class HTTPConnection: self.__state = _CS_IDLE if response.will_close: - # Pass the socket to the response - self.sock = None + # this effectively passes the connection to the response + self.close() else: # remember this, so we can tell when it is complete self.__response = response diff --git a/Lib/socket.py b/Lib/socket.py index b4969bd..0082e76 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -139,8 +139,6 @@ class _closedsocket(object): __slots__ = [] def _dummy(*args): raise error(EBADF, 'Bad file descriptor') - def close(self): - pass # All _delegate_methods must also be initialized here. send = recv = recv_into = sendto = recvfrom = recvfrom_into = _dummy __getattr__ = _dummy @@ -159,7 +157,6 @@ class _socketobject(object): setattr(self, method, getattr(_sock, method)) def close(self): - self._sock.close() self._sock = _closedsocket() dummy = self._sock._dummy for method in _delegate_methods: @@ -199,6 +199,8 @@ Core and builtins Library ------- +- Bug #978833: Revert r50844, as it broke _socketobject.dup. + - Bug #1675967: re patterns pickled with Python 2.4 and earlier can now be unpickled with Python 2.5 and newer. |