Merge pull request #17 from cardforcoin/code-style

Some simple code style fixes

Author: sibblegp

README.txt

@@ -33,7 +33,8 @@
 
 __author__ = 'gsibble'
 
-from oauth2client.client import AccessTokenRefreshError, OAuth2Credentials, AccessTokenCredentialsError
+from oauth2client.client import AccessTokenRefreshError, OAuth2Credentials, \
+    AccessTokenCredentialsError
 
 import requests
 import httplib2
@@ -59,8 +60,8 @@ def __init__(self,
                  oauth2_credentials=None,
                  api_key=None):
         """
-
-        :param oauth2_credentials: JSON representation of Coinbase oauth2 credentials
+        :param oauth2_credentials: JSON representation of Coinbase oauth2
+                credentials
         :param api_key:  Coinbase API key
         """
 
@@ -81,7 +82,8 @@ def __init__(self,
             self.http = httplib2.Http(ca_certs=ca_path)
 
             #Create our credentials from the JSON sent
-            self.oauth2_credentials = OAuth2Credentials.from_json(oauth2_credentials)
+            self.oauth2_credentials = \
+                OAuth2Credentials.from_json(oauth2_credentials)
 
             #Check our token
             self.token_expired = False
@@ -115,7 +117,7 @@ def _check_oauth_expired(self):
         """
 
         #Check if they are expired
-        if self.oauth2_credentials.access_token_expired == True:
+        if self.oauth2_credentials.access_token_expired:
 
             #Print an notification message if they are
             print 'oAuth2 Token Expired'
@@ -127,7 +129,8 @@ def refresh_oauth(self):
         """
         Refresh our oauth2 token
         :return: JSON representation of oauth token
-        :raise: AccessTokenRefreshError if there was an error refreshing the token
+        :raise: AccessTokenRefreshError if there was an error refreshing the
+                token
         """
 
         #See if we can refresh the token
@@ -136,7 +139,6 @@ def refresh_oauth(self):
             self.oauth2_credentials.refresh(http=self.http)
 
             #We were successful
-            #print 'Your token was refreshed with the following response...'
 
             #Return the token for storage
             return self.oauth2_credentials
@@ -223,28 +225,24 @@ def sell_price(self, qty=1):
         results = response.json()
         return CoinbaseAmount(results['amount'], results['currency'])
 
-    # @property
-    # def user(self):
-    #     url = COINBASE_ENDPOINT + '/account/receive_address'
-    #     response = self.session.get(url)
-    #     return response.json()
-
-
     def buy_btc(self, qty, pricevaries=False):
         """
         Buy BitCoin from Coinbase for USD
         :param qty: BitCoin quantity to be bought
-        :param pricevaries: Boolean value that indicates whether or not the transaction should
-                be processed if Coinbase cannot gaurentee the current price. 
-        :return: CoinbaseTransfer with all transfer details on success or 
-                 CoinbaseError with the error list received from Coinbase on failure
+        :param pricevaries: Boolean value that indicates whether or not the
+                transaction should be processed if Coinbase cannot guarantee
+                the current price.
+        :return: CoinbaseTransfer with all transfer details on success or
+                CoinbaseError with the error list received from Coinbase on
+                failure
         """
         url = COINBASE_ENDPOINT + '/buys'
         request_data = {
             "qty": qty,
             "agree_btc_amount_varies": pricevaries
         }
-        response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
+        response = self.session.post(url=url, data=json.dumps(request_data),
+                                     params=self.global_request_params)
         response_parsed = response.json()
         if response_parsed['success'] == False:
             return CoinbaseError(response_parsed['errors'])
@@ -257,13 +255,15 @@ def sell_btc(self, qty):
         Sell BitCoin to Coinbase for USD
         :param qty: BitCoin quantity to be sold
         :return: CoinbaseTransfer with all transfer details on success or 
-                 CoinbaseError with the error list received from Coinbase on failure
+                 CoinbaseError with the error list received from Coinbase
+                 on failure
         """
         url = COINBASE_ENDPOINT + '/sells'
         request_data = {
             "qty": qty,
         }
-        response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
+        response = self.session.post(url=url, data=json.dumps(request_data),
+                                     params=self.global_request_params)
         response_parsed = response.json()
         if response_parsed['success'] == False:
             return CoinbaseError(response_parsed['errors'])
@@ -310,7 +310,8 @@ def request(self, from_email, amount, notes='', currency='BTC'):
 
     def send(self, to_address, amount, notes='', currency='BTC'):
         """
-        Send BitCoin from this account to either an email address or a BTC address
+        Send BitCoin from this account to either an email address or a BTC
+        address
         :param to_address: Email or BTC address to where coin should be sent
         :param amount: Amount of currency to send
         :param notes: Notes to be included with transaction
@@ -338,7 +339,8 @@ def send(self, to_address, amount, notes='', currency='BTC'):
                 }
             }
 
-        response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
+        response = self.session.post(url=url, data=json.dumps(request_data),
+                                     params=self.global_request_params)
         response_parsed = response.json()
 
         if response_parsed['success'] == False:
@@ -413,7 +415,7 @@ def get_transaction(self, transaction_id):
         response = self.session.get(url, params=self.global_request_params)
         results = response.json()
 
-        if results.get('success', True) == False:
+        if not results.get('success', True):
             pass
             #TODO:  Add error handling
 
@@ -461,7 +463,8 @@ def generate_receive_address(self, callback_url=None):
                 "callback_url": callback_url
             }
         }
-        response = self.session.post(url=url, data=json.dumps(request_data), params=self.global_request_params)
+        response = self.session.post(url=url, data=json.dumps(request_data),
+                                     params=self.global_request_params)
         return response.json()['address']
 
 

coinbase/__init__.py

@@ -7,4 +7,4 @@
 
 
 TEMP_CREDENTIALS = '''
-{"_module": "oauth2client.client", "token_expiry": "2013-03-24T02:37:50Z", "access_token": "2a02d1fc82b1c42d4ea94d6866b5a232b53a3a50ad4ee899ead9afa6144c2ca3", "token_uri": "https://www.coinbase.com/oauth/token", "invalid": false, "token_response": {"access_token": "2a02d1fc82b1c42d4ea94d6866b5a232b53a3a50ad4ee899ead9afa6144c2ca3", "token_type": "bearer", "expires_in": 7200, "refresh_token": "ffec0153da773468c8cb418d07ced54c13ca8deceae813c9be0b90d25e7c3d71", "scope": "all"}, "client_id": "2df06cb383f4ffffac20e257244708c78a1150d128f37d420f11fdc069a914fc", "id_token": null, "client_secret": "7caedd79052d7e29aa0f2700980247e499ce85381e70e4a44de0c08f25bded8a", "revoke_uri": "https://accounts.google.com/o/oauth2/revoke", "_class": "OAuth2Credentials", "refresh_token": "ffec0153da773468c8cb418d07ced54c13ca8deceae813c9be0b90d25e7c3d71", "user_agent": null}'''
+{"_module": "oauth2client.client", "token_expiry": "2013-03-24T02:37:50Z", "access_token": "2a02d1fc82b1c42d4ea94d6866b5a232b53a3a50ad4ee899ead9afa6144c2ca3", "token_uri": "https://www.coinbase.com/oauth/token", "invalid": false, "token_response": {"access_token": "2a02d1fc82b1c42d4ea94d6866b5a232b53a3a50ad4ee899ead9afa6144c2ca3", "token_type": "bearer", "expires_in": 7200, "refresh_token": "ffec0153da773468c8cb418d07ced54c13ca8deceae813c9be0b90d25e7c3d71", "scope": "all"}, "client_id": "2df06cb383f4ffffac20e257244708c78a1150d128f37d420f11fdc069a914fc", "id_token": null, "client_secret": "7caedd79052d7e29aa0f2700980247e499ce85381e70e4a44de0c08f25bded8a", "revoke_uri": "https://accounts.google.com/o/oauth2/revoke", "_class": "OAuth2Credentials", "refresh_token": "ffec0153da773468c8cb418d07ced54c13ca8deceae813c9be0b90d25e7c3d71", "user_agent": null}'''

coinbase/config.py

@@ -1,7 +1,6 @@
 __author__ = 'kroberts'
 
 
-
 class CoinbaseError(object):
 
     def __init__(self, errorList):

coinbase/models/error.py

@@ -36,4 +36,4 @@ def receive_token():
     return make_response(token.to_json())
 
 if __name__ == '__main__':
-    APP.run(host='0.0.0.0', port=80)
+    APP.run(host='0.0.0.0', port=80)

coinbase_oauth2/__init__.py

@@ -62,4 +62,4 @@ def do_coinbase_stuff(account):
 
 if __name__ == '__main__':
     account = CoinbaseAccount(oauth2_credentials=TEMP_CREDENTIALS)
-    do_coinbase_stuff(account=account)
+    do_coinbase_stuff(account=account)

example.py

@@ -19,15 +19,15 @@
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX',
         'Programming Language :: Python',
-        'Topic :: Software Development :: Libraries :: Python Modules'
-        ],
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
     install_requires=[
         'httplib2>=0.8',
         'requests>=1.1.0',
-        'oauth2client>=1.1'
-        ],
+        'oauth2client>=1.1',
+    ],
     tests_require=[
         'sure>=1.2.5',
         'httpretty>=0.8.0',
-        ],
+    ],
 )