resolving conflicts

Author: Samuel-Gill

ipinfo/error.py

@@ -0,0 +1,10 @@
+import json
+
+
+class APIError(Exception):
+    def __init__(self, error_code, error_json):
+        self.error_code = error_code
+        self.error_json = error_json
+
+    def __str__(self):
+        return f"APIError: {self.error_code}\n{json.dumps(self.error_json, indent=2)}"

ipinfo/handler.py

@@ -10,6 +10,7 @@
 
 import requests
 
+from .error import APIError
 from .cache.default import DefaultCache
 from .details import Details
 from .exceptions import RequestQuotaExceededError, TimeoutExceededError
@@ -140,7 +141,10 @@ def getDetails(self, ip_address=None, timeout=None):
         response = requests.get(url, headers=headers, **req_opts)
         if response.status_code == 429:
             raise RequestQuotaExceededError()
-        response.raise_for_status()
+        if response.status_code >= 400:
+            error_response = response.json()
+            error_code = response.status_code
+            raise APIError(error_code, error_response)
         details = response.json()
 
         # format & cache

ipinfo/handler_async.py

@@ -11,6 +11,7 @@
 
 import aiohttp
 
+from .error import APIError
 from .cache.default import DefaultCache
 from .details import Details
 from .exceptions import RequestQuotaExceededError, TimeoutExceededError
@@ -163,7 +164,10 @@ async def getDetails(self, ip_address=None, timeout=None):
         async with self.httpsess.get(url, headers=headers, **req_opts) as resp:
             if resp.status == 429:
                 raise RequestQuotaExceededError()
-            resp.raise_for_status()
+            if resp.status >= 400:
+                error_response = await resp.json()
+                error_code = resp.status
+                raise APIError(error_code, error_response)
             details = await resp.json()
 
         # format & cache