more debugging

Author: fawaf

cloudflare_v4/__init__.py

@@ -1,3 +1,7 @@
+# because everything logs
+import logging
+
+# all the exceptions
 from exceptions import CloudFlareError, CloudFlareAPIError
 
 from construct import CloudFlare

cloudflare_v4/util.py

@@ -4,17 +4,25 @@
 import requests
 
 def call(auth, method, endpoint, params=None):
-    response = requests.request(method,
-            'https://api.cloudflare.com/client/v4/' + endpoint,
-            headers={ "X-Auth-Email": auth['EMAIL'],
-                      "X-Auth-Key": auth['TOKEN'] },
-            params=params
-            )
-    data = response.text
-    try:
-        data = json.loads(data)
-        return data
-    except ValueError:
-        raise CloudFlareAPIError('JSON parse failed.')
-    if data['result'] == 'error':
-        raise CloudFlareAPIError(data['msg'])
+    logging.debug('auth')
+    logging.debug('method')
+    logging.debug('endpoint')
+    logging.debug('params')
+    if (auth is None) or (method is None) or (endpoint is None):
+        raise CloudFlareError('You must specify auth, method, and endpoint')
+    else:
+        response = requests.request(method,
+                'https://api.cloudflare.com/client/v4/' + endpoint,
+                headers={ "X-Auth-Email": auth['EMAIL'],
+                          "X-Auth-Key": auth['TOKEN'] },
+                params=params
+                )
+        data = response.text
+        logging.debug('data')
+        try:
+            data = json.loads(data)
+            return data
+        except ValueError:
+            raise CloudFlareAPIError('JSON parse failed.')
+        if data['result'] == 'error':
+            raise CloudFlareAPIError(data['msg'])

cloudflare_v4/zones/__init__.py

@@ -3,4 +3,7 @@
 ENDPOINT = 'zones'
 
 def get(auth, params=None):
-    return util.call(auth, 'GET', ENDPOINT, params)
+    if type(params) is dict:
+        return util.call(auth, 'GET', ENDPOINT, params)
+    elif type(params) is str:
+        return util.call(auth)