Fix the request auth params.

Author: mhluongo

coinbase/__init__.py

@@ -37,9 +37,15 @@
     from oauth2client.client import AccessTokenRefreshError, \
         OAuth2Credentials, AccessTokenCredentialsError
     oauth2_supported = True
-except:
+except ImportError:
     oauth2_supported = False
 
+try:
+    from urllib import urlsplit, urlunsplit, quote
+except ImportError:
+    from urllib import quote
+    from urlparse import urlsplit, urlunsplit
+
 import httplib2
 import json
 import os
@@ -160,7 +166,11 @@ def __call__(self, req):
                                 'ACCESS_NONCE': nonce})
 
         elif self.api_key is not None:
-            req.params.update({'api_key': api_key})
+            url_parts = urlsplit(req.url)
+            new_query = '&'.join(
+                    filter(None, [url_parts.query,
+                                  quote('api_key={}'.format(self.api_key))]))
+            req.url = urlunsplit(url_parts._replace(query=new_query))
         return req
 
 

coinbase/tests/test_buy_price.py

@@ -24,7 +24,9 @@ def test_buy_price_with_oauth(self):
 
     def go(self, account):
         this(account.buy_price()).should.equal(self.expected_price)
-        this(last_request_params()).should.equal({'qty': ['1']})
+        params = last_request_params()
+        params.pop('api_key', None)
+        this(params).should.equal({'qty': ['1']})
 
     response_body = """
     {
@@ -54,7 +56,9 @@ def test_buy_price_with_oauth(self):
 
     def go(self, account):
         this(account.buy_price('10')).should.equal(self.expected_price)
-        this(last_request_params()).should.equal({'qty': ['10']})
+        params = last_request_params()
+        params.pop('api_key', None)
+        this(params).should.equal({'qty': ['10']})
 
     response_body = """
     {

coinbase/tests/test_sell_price.py

@@ -24,7 +24,9 @@ def test_sell_price_with_oauth(self):
 
     def go(self, account):
         this(account.sell_price()).should.equal(self.expected_price)
-        this(last_request_params()).should.equal({'qty': ['1']})
+        params = last_request_params()
+        params.pop('api_key', None)
+        this(params).should.equal({'qty': ['1']})
 
     response_body = """
     {
@@ -54,7 +56,9 @@ def test_sell_price_with_oauth(self):
 
     def go(self, account):
         this(account.sell_price(10)).should.equal(self.expected_price)
-        this(last_request_params()).should.equal({'qty': ['10']})
+        params = last_request_params()
+        params.pop('api_key', None)
+        this(params).should.equal({'qty': ['10']})
 
     response_body = """
     {