[Python-checkins] r54544 - in python/branches/release25-maint: Lib/httplib.py Lib/socket.py Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Mar 23 14:27:29 2007
New Revision: 54544

Modified:
   python/branches/release25-maint/Lib/httplib.py
   python/branches/release25-maint/Lib/socket.py
   python/branches/release25-maint/Misc/NEWS
Log:
Bug #978833: Revert r50844, as it broke _socketobject.dup.


Modified: python/branches/release25-maint/Lib/httplib.py
==============================================================================
--- python/branches/release25-maint/Lib/httplib.py	(original)
+++ python/branches/release25-maint/Lib/httplib.py	Fri Mar 23 14:27:29 2007
@@ -926,8 +926,8 @@
         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

Modified: python/branches/release25-maint/Lib/socket.py
==============================================================================
--- python/branches/release25-maint/Lib/socket.py	(original)
+++ python/branches/release25-maint/Lib/socket.py	Fri Mar 23 14:27:29 2007
@@ -139,8 +139,6 @@
     __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 @@
             setattr(self, method, getattr(_sock, method))
 
     def close(self):
-        self._sock.close()
         self._sock = _closedsocket()
         dummy = self._sock._dummy
         for method in _delegate_methods:

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Fri Mar 23 14:27:29 2007
@@ -217,6 +217,8 @@
 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.