Fix Bad HTTP error code reading #4 and also improve error handling

Author: AbstractUmbra

mystbin/client.py

@@ -119,7 +119,7 @@ async def get(self, paste_id: str) -> PasteData:
         paste_id_match = MB_URL_RE.match(paste_id)
 
         if not paste_id_match:
-            raise BadPasteID("This is an invalid Mystb.in paste ID.")
+            raise BadPasteID("This is an invalid Mystb.in paste ID.", None)
 
         paste_id = paste_id_match.group("ID")
 
@@ -129,8 +129,8 @@ async def get(self, paste_id: str) -> PasteData:
         assert self.session is not None
 
         async with self.session.get(f"{API_BASE_URL}/{paste_id}", timeout=aiohttp.ClientTimeout(CLIENT_TIMEOUT)) as response:
-            if 200 <= response.status < 300:
-                raise BadPasteID("This is an invalid Mystb.in paste ID.")
+            if not 200 <= response.status < 300:
+                raise BadPasteID("This is an invalid Mystb.in paste ID.", response)
             paste_data = await response.json()
 
         return PasteData(paste_id, paste_data)
@@ -166,13 +166,13 @@ def get(self, paste_id: str) -> PasteData:
         paste_id_match = MB_URL_RE.match(paste_id)
 
         if not paste_id_match:
-            raise BadPasteID("This is an invalid Mystb.in paste ID.")
+            raise BadPasteID("This is an invalid Mystb.in paste ID.", None)
 
         paste_id = paste_id_match.group("ID")
 
         with self.session.get(f"{API_BASE_URL}/{paste_id}", timeout=CLIENT_TIMEOUT) as response:
             if 200 <= response.status_code < 300:
-                raise BadPasteID("This is an invalid Mystb.in paste ID.")
+                raise BadPasteID("This is an invalid Mystb.in paste ID.", response)
 
         paste_data = response.json()
         return PasteData(paste_id, paste_data)

mystbin/errors.py

@@ -22,19 +22,34 @@
 DEALINGS IN THE SOFTWARE.
 """
 
+from __future__ import annotations
+
+
 __all__ = (
     "BadPasteID",
     "MystbinException",
     "APIError",
 )
 
+from typing import Optional, Union
+
+import aiohttp
 
-class BadPasteID(ValueError):
-    """Bad Paste ID."""
+
+try:
+    import requests
+except ModuleNotFoundError:
+    pass
 
 
 class MystbinException(Exception):
     """Error when interacting with Mystbin."""
+    def __init__(self, /, message: str, response: Optional[Union[aiohttp.ClientResponse, requests.Response]]) -> None:
+        self.message: str = message
+        self.response: Optional[Union[aiohttp.ClientResponse, requests.Response]] = response
+
+class BadPasteID(MystbinException):
+    """Bad Paste ID."""
 
 
 class APIError(MystbinException):