added __enter__ to work with __exit__, simplified exception handling

Author: AnthonyZJiang

src/pythonpancakes/api.py

@@ -21,6 +21,9 @@ def __init__(self, base_url=__BASE_URL):
         retries = Retry(total=3, backoff_factor=0.5, status_forcelist=[502, 503, 504])
         self.session.mount('https://', HTTPAdapter(max_retries=retries))
 
+    def __enter__(self):
+        return self
+
     def __exit__(self):
         self.session.close()
 
@@ -29,21 +32,9 @@ def __get(self, request_url: str):
         GET request wrapper
         :param request_url: str
         """
-        try:
-            response = self.session.get(request_url, timeout=self.request_timeout)
-        except requests.exceptions.RequestException:
-            raise
-
-        try:
-            response.raise_for_status()
-            return json.loads(response.content.decode('utf-8'))
-        except Exception as err:
-            try:
-                content = json.loads(response.content.decode('utf-8'))
-                raise ValueError(content)
-            except json.decoder.JSONDecodeError:
-                pass
-            raise
+        response = self.session.get(request_url, timeout=self.request_timeout)
+        response.raise_for_status()
+        return json.loads(response.content.decode('utf-8'))
 
     def summary(self):
         """
@@ -61,14 +52,11 @@ def tokens(self, address: str = None):
         :return: Dict
         """
         if address:
-            try:
-                # Trim any whitespace from address
-                address = address.replace(' ', '')
-                # Validate provided address matches ERC20 format - does not check if the address is valid on chain!
-                if not re.match("^0x([A-Fa-f0-9]{40})$", address):
-                    raise ValueError(address)
-            except ValueError:
-                return "Provided address hash is not in a valid format"
+            # Trim any whitespace from address
+            address = address.replace(' ', '')
+            # Validate provided address matches ERC20 format - does not check if the address is valid on chain!
+            if not re.match("^0x([A-Fa-f0-9]{40})$", address):
+                raise ValueError(f"Provided address hash ({address}) is not in a valid format.")
 
         url = f"{self.base_url}tokens{'/' + address if address is not None else ''}"
         return self.__get(url)
@@ -80,3 +68,4 @@ def pairs(self):
         """
         url = f"{self.base_url}pairs"
         return self.__get(url)
+