Make exception wrappers private

Make wrap_http_errors private and remove wrap_value_too_large because
it's not needed any more.

Author: chekunkov

scrapinghub/client/__init__.py

@@ -1,9 +1,8 @@
 from scrapinghub import Connection as _Connection
 from scrapinghub import HubstorageClient as _HubstorageClient
 
+from .exceptions import _wrap_http_errors
 from .projects import Projects
-from .exceptions import wrap_http_errors
-
 from .utils import parse_auth
 from .utils import parse_project_id, parse_job_key
 
@@ -13,14 +12,14 @@
 
 class Connection(_Connection):
 
-    @wrap_http_errors
+    @_wrap_http_errors
     def _request(self, *args, **kwargs):
         return super(Connection, self)._request(*args, **kwargs)
 
 
 class HubstorageClient(_HubstorageClient):
 
-    @wrap_http_errors
+    @_wrap_http_errors
     def request(self, *args, **kwargs):
         return super(HubstorageClient, self).request(*args, **kwargs)
 

scrapinghub/client/exceptions.py

@@ -5,7 +5,6 @@
 from requests import HTTPError
 
 from ..legacy import APIError
-from ..hubstorage import ValueTooLarge as _ValueTooLarge
 
 
 def _get_http_error_msg(exc):
@@ -57,7 +56,7 @@ class ServerError(ScrapinghubAPIError):
     """Indicates some server error: something unexpected has happened."""
 
 
-def wrap_http_errors(method):
+def _wrap_http_errors(method):
     """Internal helper to handle exceptions gracefully."""
     @wraps(method)
     def wrapped(*args, **kwargs):
@@ -92,14 +91,3 @@ def wrapped(*args, **kwargs):
                 raise ServerError(http_error=exc)
             raise ScrapinghubAPIError(msg)
     return wrapped
-
-
-def wrap_value_too_large(method):
-    """Internal wrapper for ValueTooLarge exception."""
-    @wraps(method)
-    def wrapped(*args, **kwargs):
-        try:
-            return method(*args, **kwargs)
-        except _ValueTooLarge as exc:
-            raise ValueTooLarge(str(exc))
-    return wrapped

scrapinghub/client/proxy.py

@@ -3,7 +3,8 @@
 import six
 import json
 
-from .exceptions import wrap_value_too_large
+from ..hubstorage import ValueTooLarge as _ValueTooLarge
+from .exceptions import ValueTooLarge
 
 
 class _Proxy(object):
@@ -53,9 +54,11 @@ class _ItemsResourceProxy(_Proxy):
     def get(self, _key, **params):
         return self._origin.get(_key, **params)
 
-    @wrap_value_too_large
     def write(self, item):
-        return self._origin.write(item)
+        try:
+            return self._origin.write(item)
+        except _ValueTooLarge as exc:
+            raise ValueTooLarge(str(exc))
 
     def iter(self, _key=None, **params):
         params = self._modify_iter_params(params)

scrapinghub/client/spiders.py

@@ -2,9 +2,8 @@
 
 from requests.compat import urljoin
 
+from .exceptions import NotFound, _wrap_http_errors
 from .jobs import Jobs
-from .exceptions import NotFound
-from .exceptions import wrap_http_errors
 from .utils import get_tags_for_update
 
 
@@ -104,7 +103,7 @@ def __init__(self, client, project_id, spider_id, spider):
         self.jobs = Jobs(client, project_id, self)
         self._client = client
 
-    @wrap_http_errors
+    @_wrap_http_errors
     def update_tags(self, add=None, remove=None):
         """Update tags for the spider.
 
@@ -118,7 +117,7 @@ def update_tags(self, add=None, remove=None):
         response = self._client._connection._session.patch(url, json=params)
         response.raise_for_status()
 
-    @wrap_http_errors
+    @_wrap_http_errors
     def list_tags(self):
         """List spider tags.