Merged revisions 70107 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70107 | benjamin.peterson | 2009-03-02 16:41:42 -0600 (Mon, 02 Mar 2009) | 1 line
give httplib.IncompleteRead a more sane repr #4308
........
diff --git a/Lib/httplib.py b/Lib/httplib.py
index 2830ad7..20a9204 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -616,7 +616,7 @@
while amt > 0:
chunk = self.fp.read(min(amt, MAXAMOUNT))
if not chunk:
- raise IncompleteRead(s)
+ raise IncompleteRead(''.join(s), amt)
s.append(chunk)
amt -= len(chunk)
return ''.join(s)
@@ -1130,9 +1130,18 @@
pass
class IncompleteRead(HTTPException):
- def __init__(self, partial):
+ def __init__(self, partial, expected=None):
self.args = partial,
self.partial = partial
+ self.expected = expected
+ def __repr__(self):
+ if self.expected is not None:
+ e = ', %i more expected' % self.expected
+ else:
+ e = ''
+ return 'IncompleteRead(%i bytes read%s)' % (len(self.partial), e)
+ def __str__(self):
+ return repr(self)
class ImproperConnectionState(HTTPException):
pass
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index c8c0648..54a2b0e 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -185,6 +185,8 @@
resp.read()
except httplib.IncompleteRead, i:
self.assertEquals(i.partial, 'hello world')
+ self.assertEqual(repr(i),'IncompleteRead(11 bytes read)')
+ self.assertEqual(str(i),'IncompleteRead(11 bytes read)')
else:
self.fail('IncompleteRead expected')
finally:
@@ -198,6 +200,23 @@
self.assertEquals(resp.read(), 'Hello\r\n')
resp.close()
+ def test_incomplete_read(self):
+ sock = FakeSocket('HTTP/1.1 200 OK\r\nContent-Length: 10\r\n\r\nHello\r\n')
+ resp = httplib.HTTPResponse(sock, method="GET")
+ resp.begin()
+ try:
+ resp.read()
+ except httplib.IncompleteRead as i:
+ self.assertEquals(i.partial, 'Hello\r\n')
+ self.assertEqual(repr(i),
+ "IncompleteRead(7 bytes read, 3 more expected)")
+ self.assertEqual(str(i),
+ "IncompleteRead(7 bytes read, 3 more expected)")
+ else:
+ self.fail('IncompleteRead expected')
+ finally:
+ resp.close()
+
class OfflineTest(TestCase):
def test_responses(self):