remove deprecated HTTPError; remove requests’ exception wrappers

to fix AttributeError: 'HTTPError' in burnash#430
Empia · Dec 20, 2016 · addd494 · addd494
1 parent e93d4dd
commit addd494
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 43 deletions.
diff --git a/gspread/client.py b/gspread/client.py
@@ -17,15 +17,16 @@
 
 from . import urlencode
 from .ns import _ns
-from .httpsession import HTTPSession, HTTPError
+from .httpsession import HTTPSession
+from .exceptions import RequestError
 from .models import Spreadsheet
 from .urls import (
     construct_url,
     DRIVE_FILES_API_V2_URL,
     DRIVE_FILES_UPLOAD_API_V2_URL
 )
 from .utils import finditem, extract_id_from_url
-from .exceptions import (SpreadsheetNotFound, UpdateCellError, RequestError)
+from .exceptions import (SpreadsheetNotFound, UpdateCellError)
 
 
 class Client(object):
@@ -189,10 +190,7 @@ def del_spreadsheet(self, file_id):
             file_id
         )
 
-        try:
-            self.session.delete(url)
-        except HTTPError as ex:
-            raise RequestError(ex.message)
+        self.session.delete(url)
 
     def del_worksheet(self, worksheet):
         url = construct_url(
@@ -219,9 +217,9 @@ def put_feed(self, url, data):
 
         try:
             r = self.session.put(url, data, headers=headers)
-        except HTTPError as ex:
-            if getattr(ex, 'code', None) == 403:
-                raise UpdateCellError(ex.message)
+        except RequestError as ex:
+            if ex[0] == 403:
+                raise UpdateCellError(ex[1])
             else:
                 raise
 
@@ -231,10 +229,7 @@ def post_feed(self, url, data):
         headers = {'Content-Type': 'application/atom+xml'}
         data = self._ensure_xml_header(data)
 
-        try:
-            r = self.session.post(url, data, headers=headers)
-        except HTTPError as ex:
-            raise RequestError(ex.message)
+        r = self.session.post(url, data, headers=headers)
 
         return ElementTree.fromstring(r.content)
 
@@ -292,18 +287,15 @@ def import_csv(self, file_id, data):
         headers = {'Content-Type': 'text/csv'}
         url = '{0}/{1}'.format(DRIVE_FILES_UPLOAD_API_V2_URL, file_id)
 
-        try:
-            self.session.put(
-                url,
-                data=data,
-                params={
-                    'uploadType': 'media',
-                    'convert': True
-                },
-                headers=headers
-            )
-        except HTTPError as ex:
-            raise RequestError(ex.message)
+        self.session.put(
+            url,
+            data=data,
+            params={
+                'uploadType': 'media',
+                'convert': True
+            },
+            headers=headers
+        )
 
     def list_permissions(self, file_id):
         """Retrieve a list of permissions for a file.
@@ -374,13 +366,15 @@ def insert_permission(
             'sendNotificationEmails': notify,
             'emailMessage': email_message
         }
-        
+
         headers = {'Content-Type': 'application/json'}
 
-        try:
-            self.session.post(url, json.dumps(data), params=params, headers=headers)
-        except HTTPError as ex:
-            raise RequestError(ex.message)
+        self.session.post(
+            url,
+            json.dumps(data),
+            params=params,
+            headers=headers
+        )
 
     def remove_permission(self, file_id, permission_id):
         """Deletes a permission from a file.
@@ -395,10 +389,7 @@ def remove_permission(self, file_id, permission_id):
         )
         headers = {'Content-Type': 'application/json'}
 
-        try:
-            self.session.delete(url, headers=headers)
-        except HTTPError as ex:
-            raise RequestError(ex.message)
+        self.session.delete(url, headers=headers)
 
 
 def authorize(credentials):

diff --git a/gspread/exceptions.py b/gspread/exceptions.py
@@ -43,9 +43,3 @@ class UpdateCellError(GSpreadException):
 
 class RequestError(GSpreadException):
     """Error while sending API request."""
-
-class HTTPError(RequestError):
-    """DEPRECATED. Error while sending API request."""
-    def __init__(self, code, msg):
-        super(HTTPError, self).__init__(msg)
-        self.code = code
diff --git a/gspread/httpsession.py b/gspread/httpsession.py
@@ -20,7 +20,7 @@
     basestring = unicode = str
 
 
-from .exceptions import HTTPError
+from .exceptions import RequestError
 
 
 class HTTPSession(object):
@@ -60,11 +60,12 @@ def request(self, method, url, data=None, params=None, headers=None, files=None,
         try:
             func = getattr(self.requests_session, method.lower())
         except AttributeError:
-            raise Exception("HTTP method '{}' is not supported".format(method))
+            raise RequestError("HTTP method '{}' is not supported".format(method))
+
         response = func(url, data=data, params=params, headers=request_headers, files=files, json=json)
 
         if response.status_code > 399:
-            raise HTTPError(response.status_code, "{0}: {1}".format(
+            raise RequestError(response.status_code, "{0}: {1}".format(
                 response.status_code, response.content))
         return response