Handling errors in TwitterHTTPError __init__

[z_archive/twitter.git] / twitter / api.py

diff --git a/twitter/api.py b/twitter/api.py
index 2864274e7e7e57cb12762c904ff860e510b10e9c..daa3a2bfdb58ccd70b144edb9e482f019a4542c5 100644 (file)
--- 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
@@ -41,12 +42,18 @@ class TwitterHTTPError(TwitterError):
         self.uri = uri
         self.format = format
         self.uriparts = uriparts
+        try:
+            data = self.e.fp.read()
+        except httplib.IncompleteRead, e:
+            # can't read the error text
+            # let's try some of it
+            data = e.partial
         if self.e.headers['Content-Encoding'] == 'gzip':
-            buf = StringIO(self.e.fp.read())
+            buf = StringIO(data)
             f = gzip.GzipFile(fileobj=buf)
             self.response_data = f.read()
         else:
-            self.response_data = self.e.fp.read()
+            self.response_data = data
 
     def __str__(self):
         fmt = ("." + self.format) if self.format else ""
@@ -167,9 +174,9 @@ class TwitterCall(object):
         _id = kwargs.pop('_id', None)
         if _id:
             kwargs['id'] = _id
-        
-        # If an timeout is specified in kwargs, use it
-        timeout = kwargs.pop('timeout', None)
+
+        # If an _timeout is specified in kwargs, use it
+        _timeout = kwargs.pop('_timeout', None)
 
         secure_str = ''
         if self.secure:
@@ -191,24 +198,27 @@ class TwitterCall(object):
                 body = arg_data.encode('utf8')
 
         req = urllib_request.Request(uriBase, body, headers)
-        return self._handle_response(req, uri, arg_data, timeout)
+        return self._handle_response(req, uri, arg_data, _timeout)
 
-    def _handle_response(self, req, uri, arg_data, timeout=None):
+    def _handle_response(self, req, uri, arg_data, _timeout=None):
         kwargs = {}
-        if timeout:
-            kwargs['timeout'] = timeout
+        if _timeout:
+            kwargs['timeout'] = _timeout
         try:
             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)
@@ -238,8 +248,8 @@ class Twitter(TwitterCall):
         t = Twitter(
             auth=OAuth(token, token_key, con_secret, con_secret_key)))
 
-        # Get the public timeline
-        t.statuses.public_timeline()
+        # Get your "home" timeline
+        t.statuses.home_timeline()
 
         # Get a particular friend's timeline
         t.statuses.friends_timeline(id="billybob")
@@ -262,25 +272,20 @@ class Twitter(TwitterCall):
         # Note how the magic `_` method can be used to insert data
         # into the middle of a call. You can also use replacement:
         t.user.list.members(user="tamtar", list="things-that-are-rad")
-        
-        # An *optional* `timeout` parameter can also be used for API
+
+        # An *optional* `_timeout` parameter can also be used for API
         # calls which take much more time than normal or twitter stops
         # responding for some reasone
         t.users.lookup(
             screen_name=','.join(A_LIST_OF_100_SCREEN_NAMES), \
-            timeout=1)
+            _timeout=1)
 
 
 
     Searching Twitter::
 
-        twitter_search = Twitter(domain="search.twitter.com")
-
-        # Find the latest search trends
-        twitter_search.trends()
-
-        # Search for the latest News on #gaza
-        twitter_search.search(q="#gaza")
+        # Search for the latest tweets about #pycon
+        t.search.tweets(q="#pycon")
 
 
     Using the data returned
@@ -289,7 +294,7 @@ class Twitter(TwitterCall):
     Twitter API calls return decoded JSON. This is converted into
     a bunch of Python lists, dicts, ints, and strings. For example::
 
-        x = twitter.statuses.public_timeline()
+        x = twitter.statuses.home_timeline()
 
         # The first 'tweet' in the timeline
         x[0]