Moved exceptions classes inside main client class

foobot_async/__init__.py

@@ -13,7 +13,7 @@ class FoobotClient(object):
     """
     Foobot API client
 
-    :param token: API secret key used for authentication, see main doc on how 
+    :param token: API secret key used for authentication, see main doc on how
         to obtain one
     :type token: str
     :param username: Your username for your Foobot account
@@ -44,7 +44,7 @@ def get_devices(self):
         Get a list of devices associated with that account.
 
         :returns: list of devices
-        :raises: FoobotClientError, AuthFailure, BadFormat, ForbiddenAccess,
+        :raises: ClientError, AuthFailure, BadFormat, ForbiddenAccess,
                  TooManyRequests, InternalError
 
         .. note::
@@ -70,7 +70,7 @@ def get_last_data(self, uuid, period=0, average_by=0):
             long range requests (e.g. more than 1 day)
         :type average_by: integer
         :returns: list of datapoints
-        :raises: FoobotClientError, AuthFailure, BadFormat, ForbiddenAccess,
+        :raises: ClientError, AuthFailure, BadFormat, ForbiddenAccess,
                  TooManyRequests, InternalError
 
         .. note::
@@ -107,7 +107,7 @@ def get_historical_data(self, uuid, start, end, average_by=0):
             long range requests (e.g. more than 1 day)
         :type average_by: integer
         :returns: list of datapoints
-        :raises: FoobotClientError, AuthFailure, BadFormat, ForbiddenAccess,
+        :raises: ClientError, AuthFailure, BadFormat, ForbiddenAccess,
                  TooManyRequests, InternalError
 
         .. seealso:: :func:`parse_data` for return data syntax
@@ -152,33 +152,33 @@ def _get(self, path, **kwargs):
             resp = yield from self._session.get(
                     path, headers=dict(self._headers, **kwargs))
             if resp.status == 400:
-                raise BadFormat(resp.text())
+                raise FoobotClient.BadFormat(resp.text())
             elif resp.status == 401:
-                raise AuthFailure(resp.text())
+                raise FoobotClient.AuthFailure(resp.text())
             elif resp.status == 403:
-                raise ForbiddenAccess(resp.text())
+                raise FoobotClient.ForbiddenAccess(resp.text())
             elif resp.status == 429:
-                raise TooManyRequests(resp.text())
+                raise FoobotClient.TooManyRequests(resp.text())
             elif resp.status == 500:
-                raise InternalError(resp.text())
+                raise FoobotClient.InternalError(resp.text())
             elif resp.status != 200:
-                raise FoobotClientError(resp.text())
+                raise FoobotClient.ClientError(resp.text())
             return (yield from resp.json())
 
-class FoobotClientError(Exception):
-    pass
+    class ClientError(Exception):
+        pass
 
-class AuthFailure(FoobotClientError):
-    pass
+    class AuthFailure(ClientError):
+        pass
 
-class BadFormat(FoobotClientError):
-    pass
+    class BadFormat(ClientError):
+        pass
 
-class ForbiddenAccess(FoobotClientError):
-    pass
+    class ForbiddenAccess(ClientError):
+        pass
 
-class TooManyRequests(FoobotClientError):
-    pass
+    class TooManyRequests(ClientError):
+        pass
 
-class InternalError(FoobotClientError):
-    pass
+    class InternalError(ClientError):
+        pass

setup.py

@@ -2,7 +2,7 @@
 
 setuptools.setup(
     name="foobot_async",
-    version="0.1.0",
+    version="0.2.0",
     url="https://github.com/reefab/foobot_async",
 
     author="Fabien Piuzzi",

tests/test_foobot_async.py

@@ -3,7 +3,7 @@
 import pytest
 from aioresponses import aioresponses
 from datetime import datetime
-from foobot_async import *
+from foobot_async import FoobotClient
 
 client = FoobotClient('token', 'example@example.com')
 loop = asyncio.get_event_loop()
@@ -45,7 +45,7 @@ def test_failed_auth_request():
         mocked.get('https://api.foobot.io/v2/owner/example@example.com/device/',
                    status=401, body='{"message": "invalid key provided"}')
 
-        with pytest.raises(AuthFailure):
+        with pytest.raises(FoobotClient.AuthFailure):
             resp = loop.run_until_complete(client.get_devices())
 
 def test_failed_bad_format_request():
@@ -57,7 +57,7 @@ def test_failed_bad_format_request():
                                         "stack": "[obfuscated]",
                                         "propagatedException": null}''')
 
-        with pytest.raises(BadFormat):
+        with pytest.raises(FoobotClient.BadFormat):
             resp = loop.run_until_complete(client.get_devices())
 
 def test_forbidden_access_request():
@@ -68,31 +68,31 @@ def test_forbidden_access_request():
                                          "propagatedException": null }":
                                          "invalid key provided"}''')
 
-        with pytest.raises(ForbiddenAccess):
+        with pytest.raises(FoobotClient.ForbiddenAccess):
             resp = loop.run_until_complete(client.get_devices())
 
 def test_overquota_request():
     with aioresponses() as mocked:
         mocked.get('https://api.foobot.io/v2/owner/example@example.com/device/',
                    status=429, body='')
 
-        with pytest.raises(TooManyRequests):
+        with pytest.raises(FoobotClient.TooManyRequests):
             resp = loop.run_until_complete(client.get_devices())
 
 def test_internal_error_request():
     with aioresponses() as mocked:
         mocked.get('https://api.foobot.io/v2/owner/example@example.com/device/',
                    status=500, body='')
 
-        with pytest.raises(InternalError):
+        with pytest.raises(FoobotClient.InternalError):
             resp = loop.run_until_complete(client.get_devices())
 
 def test_unhandled_error_request():
     with aioresponses() as mocked:
         mocked.get('https://api.foobot.io/v2/owner/example@example.com/device/',
                    status=404, body='')
 
-        with pytest.raises(FoobotClientError):
+        with pytest.raises(FoobotClient.ClientError):
             resp = loop.run_until_complete(client.get_devices())
 
 def test_get_last_data_request():