Issue #16658: add missing return to HTTPConnection.send().

Patch by Jeff Knupp
This commit is contained in:
Andrew Svetlov 2013-04-12 22:49:19 +03:00
parent a3b255f275
commit 7b2c8bb833
3 changed files with 25 additions and 1 deletions

View File

@ -866,7 +866,7 @@ class HTTPConnection:
if encode:
datablock = datablock.encode("iso-8859-1")
self.sock.sendall(datablock)
return
try:
self.sock.sendall(data)
except TypeError:

View File

@ -371,6 +371,27 @@ class BasicTest(TestCase):
conn.send(io.BytesIO(expected))
self.assertEqual(expected, sock.data)
def test_send_updating_file(self):
def data():
yield 'data'
yield None
yield 'data_two'
class UpdatingFile():
mode = 'r'
d = data()
def read(self, blocksize=-1):
return self.d.__next__()
expected = b'data'
conn = client.HTTPConnection('example.com')
sock = FakeSocket("")
conn.sock = sock
conn.send(UpdatingFile())
self.assertEqual(sock.data, expected)
def test_send_iter(self):
expected = b'GET /foo HTTP/1.1\r\nHost: example.com\r\n' \
b'Accept-Encoding: identity\r\nContent-Length: 11\r\n' \

View File

@ -23,6 +23,9 @@ Core and Builtins
Library
-------
- Issue #16658: add missing return to HTTPConnection.send()
Patch by Jeff Knupp.
- Issue #14971: unittest test discovery no longer gets confused when a function
has a different __name__ than its name in the TestCase class dictionary.