Merge pull request corpetty#23 from d3QUone/client_exceptions_22

corpetty · web-flow · commit 138ca5e22b48 · 2018-05-12T11:39:07.000-04:00
Added client errors to indicate the problems
diff --git a/etherscan/client.py b/etherscan/client.py
@@ -1,6 +1,35 @@
-import requests
+# coding: utf-8
 import collections
 
+import requests
+
+
+class ClientException(Exception):
+    """Unhandled API client exception"""
+    message = 'unhandled error'
+
+    def __init__(self, message=None):
+        if message is not None:
+            self.message = message
+
+    def __unicode__(self):
+        return u'<Err: {0.message}>'.format(self)
+
+    __str__ = __unicode__
+
+
+class ConnectionRefused(ClientException):
+    """Connection refused by remote host"""
+
+
+class EmptyResponse(ClientException):
+    """Empty response from API"""
+
+
+class BadRequest(ClientException):
+    """Invalid request passed"""
+
+
 #  Assume user puts his API key in the api_key.json file under variable name "key"
 class Client(object):
     dao_address = '0xbb9bc244d798123fde783fcc1c72d3bb8c189413'
@@ -65,8 +94,7 @@ def __init__(self, address, api_key=''):
         # self.key = self.URL_BASES['key'] + self.API_KEY
 
         if (len(address) > 20) and (type(address) == list):
-            print("Etherscan only takes 20 addresses at a time")
-            quit()
+            raise BadRequest("Etherscan only takes 20 addresses at a time")
         elif (type(address) == list) and (len(address) <= 20):
             self.url_dict[self.ADDRESS] = ','.join(address)
         else:
@@ -80,23 +108,17 @@ def connect(self):
         try:
             req = self.http.get(self.url)
         except requests.exceptions.ConnectionError:
-            print("Connection refused")
-            exit()
-            
+            raise ConnectionRefused
+
         if req.status_code == 200:
             # Check for empty response
             if req.text:
-                if req.json()['status'] == '1':
-                    return req.json()
+                data = req.json()
+                if data.get('status') == '1':
+                    return data
                 else:
-                    print(req.json()['message'])
-                    exit()
-            else:
-                print("Invalid Request")
-                exit()
-        else:
-            print("Problem with connection, status code: ", req.status_code)
-            exit()
+                    raise EmptyResponse(data.get('message', 'no message'))
+        raise BadRequest("Problem with connection, status code: %s" % req.status_code)
 
     def check_and_get_api(self):
         if self.url_dict[self.API_KEY]:  # Check if api_key is empty string
diff --git a/pip-requirements.txt b/pip-requirements.txt
@@ -0,0 +1 @@
+requests==2.18.4
diff --git a/setup.py b/setup.py
@@ -8,5 +8,8 @@
     license='MIT',
     author='coreypetty',
     author_email='corey.a.petty@gmail.com',
-    description='Python Bindings to Etherscan.io API'
+    description='Python Bindings to Etherscan.io API',
+    requires=[
+        'requests==2.18.4',
+    ],
 )
