add edge case for error handling re 6c41fac

jeremylow · jeremylow · commit 5f1cc0f5bf3c · 2016-10-03T07:24:19.000-04:00
diff --git a/tests/test_error_handling.py b/tests/test_error_handling.py
@@ -0,0 +1,39 @@
+# encoding: utf-8
+from __future__ import unicode_literals, print_function
+
+import json
+import re
+import sys
+import unittest
+import warnings
+
+import twitter
+
+warnings.filterwarnings('ignore', category=DeprecationWarning)
+
+import responses
+from responses import GET, POST
+
+DEFAULT_URL = re.compile(r'https?://.*\.twitter.com/1\.1/.*')
+BODY = b'{"request":"\\/1.1\\/statuses\\/user_timeline.json","error":"Not authorized."}'
+
+
+class ApiTest(unittest.TestCase):
+
+    def setUp(self):
+        self.api = twitter.Api(
+            consumer_key='test',
+            consumer_secret='test',
+            access_token_key='test',
+            access_token_secret='test',
+            sleep_on_rate_limit=False,
+            chunk_size=500 * 1024)
+
+    @responses.activate
+    def testGetShortUrlLength(self):
+        responses.add(GET, DEFAULT_URL, body=BODY, status=401)
+
+        try:
+            resp = self.api.GetUserTimeline(screen_name="twitter")
+        except twitter.TwitterError as e:
+            self.assertEqual(e.message, "Not authorized.")
diff --git a/twitter/api.py b/twitter/api.py
@@ -1064,7 +1064,7 @@ def UploadMediaSimple(self,
         url = '%s/media/upload.json' % self.upload_url
         parameters = {}
 
-        media_fp, filename, file_size, media_type = parse_media_file(media)
+        media_fp, _, _, _ = parse_media_file(media)
 
         parameters['media'] = media_fp.read()
 
@@ -3263,7 +3263,6 @@ def IncomingFriendship(self,
                     parameters['count'] = int(cursor)
                 except ValueError:
                     raise TwitterError({'message': "cursor must be an integer"})
-                    break
             resp = self._RequestUrl(url, 'GET', data=parameters)
             data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
             result += [x for x in data['ids']]
@@ -3308,7 +3307,6 @@ def OutgoingFriendship(self,
                     parameters['count'] = int(cursor)
                 except ValueError:
                     raise TwitterError({'message': "cursor must be an integer"})
-                    break
             resp = self._RequestUrl(url, 'GET', data=parameters)
             data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
             result += [x for x in data['ids']]
@@ -4786,27 +4784,19 @@ def _ParseAndCheckTwitter(self, json_data):
         This is a purely defensive check because during some Twitter
         network outages it will return an HTML failwhale page.
         """
-        data = None
         try:
             data = json.loads(json_data)
-            try:
-                self._CheckForTwitterError(data)
-
-            except ValueError:
-                if "<title>Twitter / Over capacity</title>" in json_data:
-                    raise TwitterError({'message': "Capacity Error"})
-                if "<title>Twitter / Error</title>" in json_data:
-                    raise TwitterError({'message': "Technical Error"})
-                if "Exceeded connection limit for user" in json_data:
-                    raise TwitterError({'message': "Exceeded connection limit for user"})
-                if "Error 401 Unauthorized" in json_data:
-                    raise TwitterError({'message': "Unauthorized"})
-                raise TwitterError({'message': "Unknown error, try addeding "})
-
-        except:
+        except ValueError:
+            if "<title>Twitter / Over capacity</title>" in json_data:
+                raise TwitterError({'message': "Capacity Error"})
+            if "<title>Twitter / Error</title>" in json_data:
+                raise TwitterError({'message': "Technical Error"})
+            if "Exceeded connection limit for user" in json_data:
+                raise TwitterError({'message': "Exceeded connection limit for user"})
             if "Error 401 Unauthorized" in json_data:
                 raise TwitterError({'message': "Unauthorized"})
-
+            raise TwitterError({'Unknown error: {0}'.format(json_data)})
+        self._CheckForTwitterError(data)
         return data
 
     def _CheckForTwitterError(self, data):
