Properly try to parse server message before raising errors

tsnoam · web-flow · commit 7a89dcb91124 · 2017-06-21T23:34:35.000+03:00
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -183,24 +183,26 @@ def _request_wrapper(self, *args, **kwargs):
             # 200-299 range are HTTP success statuses
             return resp.data
 
+        try:
+            message = self._parse(resp.data)
+        except ValueError:
+            message = 'Unknown HTTPError'
+
         if resp.status in (401, 403):
             raise Unauthorized(message)
         elif resp.status == 400:
             raise BadRequest(message)
         elif resp.status == 404:
             raise InvalidToken()
         elif resp.status == 413:
-            raise NetworkError('File too large. Check telegram api limits https://core.telegram.org/bots/api#senddocument')
+            raise NetworkError('File too large. Check telegram api limits '
+                               'https://core.telegram.org/bots/api#senddocument')
+
         elif resp.status == 502:
             raise NetworkError('Bad Gateway')
         else:
             raise NetworkError('{0} ({1})'.format(message, resp.status))
 
-        try:
-            message = self._parse(resp.data)
-        except ValueError:
-            raise NetworkError('Unknown HTTPError {0}'.format(resp.status))
-
     def get(self, url, timeout=None):
         """Request an URL.
 
