Updated JSON Parsing to PublicClient for testing per issue danpaquin#8

danpaquin · danpaquin · commit c04aff9ec362 · 2017-01-16T23:07:48.000-05:00
diff --git a/GDAX/PublicClient.py b/GDAX/PublicClient.py
@@ -19,20 +19,20 @@ def getProducts(self):
 
     def getProductOrderBook(self, json=None, level=2, product=''):
         if type(json) is dict:
-            product = json['product'] or self.productId
-            level = json['level'] or '1'
+            if "product" in json: product = json["product"]
+            if "level" in json: level = json['level']
         response = requests.get(self.url + '/products/%s/book?level=%s' % (product or self.productId, str(level)))
         return response.json()
 
     def getProductTicker(self, json=None, product=''):
         if type(json) is dict:
-            product = json['product'] or self.productId
+            if "product" in json: product = json["product"]
         response = requests.get(self.url + '/products/%s/ticker' % (product or self.productId))
         return response.json()
 
     def getProductTrades(self, json=None, product=''):
         if type(json) is dict:
-            product = json['product'] or self.productId
+            if "product" in json: product = json["product"]
         response = requests.get(self.url + '/products/%s/trades' % (product or self.productId))
         return response.json()
 
@@ -50,7 +50,7 @@ def getProductHistoricRates(self, json=None, product='', start='', end='', granu
 
     def getProduct24HrStats(self, json=None, product=''):
         if type(json) is dict:
-            product = json['product'] or self.productId
+            if "product" in json: product = json["product"]
         response = requests.get(self.url + '/products/%s/stats' % (product or self.productId))
         return response.json()
 
