[Python-checkins] r67226 - in python/trunk: Lib/httplib.py Misc/NEWS

brett.cannon python-checkins at python.org
Sat Nov 15 23:40:44 CET 2008


Author: brett.cannon
Date: Sat Nov 15 23:40:44 2008
New Revision: 67226

Log:
The docs for httplib.HTTPConnection.putheader() have claimed for quite a while
that their could be an arbitrary number of values passed in. Turns out the code
did not match that. The code now matches the docs.


Modified:
   python/trunk/Lib/httplib.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/httplib.py
==============================================================================
--- python/trunk/Lib/httplib.py	(original)
+++ python/trunk/Lib/httplib.py	Sat Nov 15 23:40:44 2008
@@ -846,7 +846,7 @@
             # For HTTP/1.0, the server will assume "not chunked"
             pass
 
-    def putheader(self, header, value):
+    def putheader(self, header, *values):
         """Send a request header line to the server.
 
         For example: h.putheader('Accept', 'text/html')
@@ -854,7 +854,7 @@
         if self.__state != _CS_REQ_STARTED:
             raise CannotSendHeader()
 
-        str = '%s: %s' % (header, value)
+        str = '%s: %s' % (header, '\r\n\t'.join(values))
         self._output(str)
 
     def endheaders(self):
@@ -989,6 +989,7 @@
         # set up delegation to flesh out interface
         self.send = conn.send
         self.putrequest = conn.putrequest
+        self.putheader = conn.putheader
         self.endheaders = conn.endheaders
         self.set_debuglevel = conn.set_debuglevel
 
@@ -1008,10 +1009,6 @@
         "Provide a getfile, since the superclass' does not use this concept."
         return self.file
 
-    def putheader(self, header, *values):
-        "The superclass allows only one value argument."
-        self._conn.putheader(header, '\r\n\t'.join(values))
-
     def getreply(self):
         """Compat definition since superclass does not define it.
 

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Nov 15 23:40:44 2008
@@ -38,6 +38,9 @@
 Library
 -------
 
+- httplib.HTTPConnection.putheader() now accepts an arbitrary number of values
+  for any header, matching what the documentation has claimed for a while.
+
 - Issue #3774: Fixed an error when create a Tkinter menu item without command
   and then remove it.
 


More information about the Python-checkins mailing list