Merged revisions 75137 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75137 | antoine.pitrou | 2009-09-29 20:44:53 +0200 (mar., 29 sept. 2009) | 14 lines

  [NOTE: the original bug doesn't exist in py3k but this adds Kirk's tests and fixes
  another bug in the process]


  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.
  ........
................
This commit is contained in:
Antoine Pitrou 2009-09-29 19:02:24 +00:00
parent 941071ef79
commit 595ad32f59
3 changed files with 27 additions and 4 deletions

View file

@ -726,10 +726,17 @@ class HTTPConnection:
if self.debuglevel > 0:
print("sendIng a read()able")
encode = False
if "b" not in str.mode:
encode = True
if self.debuglevel > 0:
print("encoding file using iso-8859-1")
try:
mode = str.mode
except AttributeError:
# io.BytesIO and other file-like objects don't have a `mode`
# attribute.
pass
else:
if "b" not in mode:
encode = True
if self.debuglevel > 0:
print("encoding file using iso-8859-1")
while 1:
data = str.read(blocksize)
if not data: