[Python-checkins] r75135 - in python/branches/release26-maint: Lib/httplib.py Lib/test/test_httplib.py Misc/ACKS Misc/NEWS

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Sep 29 20:14:09 2009
New Revision: 75135

Log:
Merged revisions 75134 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75134 | antoine.pitrou | 2009-09-29 19:48:18 +0200 (mar., 29 sept. 2009) | 4 lines
  
  Issue #6790: Make it possible again to pass an `array.array` to
  `httplib.HTTPConnection.send`. Patch by Kirk McDonald.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/httplib.py
   python/branches/release26-maint/Lib/test/test_httplib.py
   python/branches/release26-maint/Misc/ACKS
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/httplib.py
==============================================================================
--- python/branches/release26-maint/Lib/httplib.py	(original)
+++ python/branches/release26-maint/Lib/httplib.py	Tue Sep 29 20:14:09 2009
@@ -66,6 +66,7 @@
 Req-sent-unread-response       _CS_REQ_SENT       <response_class>
 """
 
+from array import array
 import socket
 from sys import py3kwarning
 from urlparse import urlsplit
@@ -732,7 +733,7 @@
             print "send:", repr(str)
         try:
             blocksize=8192
-            if hasattr(str,'read') :
+            if hasattr(str,'read') and not isinstance(str, array):
                 if self.debuglevel > 0: print "sendIng a read()able"
                 data=str.read(blocksize)
                 while data:

Modified: python/branches/release26-maint/Lib/test/test_httplib.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_httplib.py	(original)
+++ python/branches/release26-maint/Lib/test/test_httplib.py	Tue Sep 29 20:14:09 2009
@@ -1,3 +1,4 @@
+import array
 import httplib
 import StringIO
 import socket
@@ -15,7 +16,7 @@
         self.data = ''
 
     def sendall(self, data):
-        self.data += data
+        self.data += ''.join(data)
 
     def makefile(self, mode, bufsize=None):
         if mode != 'r' and mode != 'rb':
@@ -162,6 +163,20 @@
         conn.request('GET', '/foo', body)
         self.assertTrue(sock.data.startswith(expected))
 
+    def test_send(self):
+        expected = 'this is a test this is only a test'
+        conn = httplib.HTTPConnection('example.com')
+        sock = FakeSocket(None)
+        conn.sock = sock
+        conn.send(expected)
+        self.assertEquals(expected, sock.data)
+        sock.data = ''
+        conn.send(array.array('c', expected))
+        self.assertEquals(expected, sock.data)
+        sock.data = ''
+        conn.send(StringIO.StringIO(expected))
+        self.assertEquals(expected, sock.data)
+
     def test_chunked(self):
         chunked_start = (
             'HTTP/1.1 200 OK\r\n'

Modified: python/branches/release26-maint/Misc/ACKS
==============================================================================
--- python/branches/release26-maint/Misc/ACKS	(original)
+++ python/branches/release26-maint/Misc/ACKS	Tue Sep 29 20:14:09 2009
@@ -458,6 +458,7 @@
 Graham Matthews
 Dieter Maurer
 Arnaud Mazin
+Kirk McDonald
 Chris McDonough
 Greg McFarlane
 Alan McIntyre

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Tue Sep 29 20:14:09 2009
@@ -85,6 +85,9 @@
 Library
 -------
 
+- Issue #6790: Make it possible again to pass an `array.array` to
+  `httplib.HTTPConnection.send`. Patch by Kirk McDonald.
+
 - Issue #6236, #6348: Fix various failures in the `io` module under AIX
   and other platforms, when using a non-gcc compiler. Patch by egreen.