Merge pull request #37 from michaelvanvliet/master

Include timeout option for connection to API

Author: ksm2

README.md

@@ -172,6 +172,7 @@ Websocket methods do not return your returning weight points, you track your rem
 limit = bitvavo.getRemainingLimit()
 ```
 
+
 If you make more requests than permitted by the weight limit, your IP or API key is banned. 
 
 The rate weighting for each endpoint is supplied in the [Bitvavo API documentation](https://docs.bitvavo.com/).

python_bitvavo_api/bitvavo.py

@@ -155,6 +155,8 @@ def __init__(self, options = {}):
         self.base = options[key]
       elif key.lower() == "wsurl":
         self.wsUrl = options[key]
+      elif key.lower() == "timeout":
+        self.timeout = options[key]        
     if(self.ACCESSWINDOW == None):
       self.ACCESSWINDOW = 10000
 
@@ -194,9 +196,9 @@ def publicRequest(self, url):
         'bitvavo-access-timestamp': str(now),
         'bitvavo-access-window': str(self.ACCESSWINDOW)
       }
-      r = requests.get(url, headers = headers)
+      r = requests.get(url, headers = headers, timeout = self.timeout)
     else:
-      r = requests.get(url)
+      r = requests.get(url, timeout = self.timeout)
     if('error' in r.json()):
       self.updateRateLimit(r.json())
     else:
@@ -215,13 +217,13 @@ def privateRequest(self, endpoint, postfix, body = {}, method = 'GET'):
     }
     debugToConsole("REQUEST: " + url)
     if(method == 'GET'):
-      r = requests.get(url, headers = headers)
+      r = requests.get(url, headers = headers, timeout = self.timeout)
     elif(method == 'DELETE'):
-      r = requests.delete(url, headers = headers)
+      r = requests.delete(url, headers = headers, timeout = self.timeout)
     elif(method == 'POST'):
-      r = requests.post(url, headers = headers, json = body)
+      r = requests.post(url, headers = headers, json = body, timeout = self.timeout)
     elif(method == 'PUT'):
-      r = requests.put(url, headers = headers, json = body)
+      r = requests.put(url, headers = headers, json = body, timeout = self.timeout)
     if('error' in r.json()):
       self.updateRateLimit(r.json())
     else: