From: Daniel Murray <redacted>
Date: Wed, 13 Feb 2013 07:05:32 +0000 (+0800)
Subject: TwitterCall._handle_response(): if reading from handle raises httlib.IncompleteRead... 
X-Git-Tag: twitter-1.9.2~8^2
X-Git-Url: https://jfr.im/git/z_archive/twitter.git/commitdiff_plain/0fdfdc3d1f7d72209718847c69313db2a263f6d5

TwitterCall._handle_response(): if reading from handle raises httlib.IncompleteRead, attempt to continue using the partial response
---

diff --git a/twitter/api.py b/twitter/api.py
index 6571735..c61ffc5 100644
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -15,6 +15,7 @@ from twitter.auth import NoAuth
 
 import re
 import gzip
+import httplib
 
 try:
     import json
@@ -201,14 +202,17 @@ class TwitterCall(object):
             handle = urllib_request.urlopen(req, **kwargs)
             if handle.headers['Content-Type'] in ['image/jpeg', 'image/png']:
                 return handle
-            elif handle.info().get('Content-Encoding') == 'gzip':
+            try:
+                data = handle.read()
+            except httplib.IncompleteRead, e:
+                # Even if we don't get all the bytes we should have there
+                # may be a complete response in e.partial
+                data = e.partial
+            if handle.info().get('Content-Encoding') == 'gzip':
                 # Handle gzip decompression
-                buf = StringIO(handle.read())
+                buf = StringIO(data)
                 f = gzip.GzipFile(fileobj=buf)
                 data = f.read()
-            else:
-                data = handle.read()
-
             if "json" == self.format:
                 res = json.loads(data.decode('utf8'))
                 return wrap_response(res, handle.headers)