Fixed code formatting warnings

Author: aseveryn-hw

hyperwallet/utils/apiclient.py

@@ -193,7 +193,7 @@ def doPut(self, partialUrl, data):
             data=json.dumps(data).encode('utf-8')
         )
 
-    def __getRequestData(data):
+    def __getRequestData(self, data):
         '''
         If encryption is enabled try to encrypt request data, otherwise no action required.
 

hyperwallet/utils/encryption.py

@@ -12,10 +12,7 @@
 from jose import jws
 
 from hyperwallet.exceptions import HyperwalletException
-try:
-    from urlparse import urlparse
-except:
-    from urllib.parse import urlparse
+from six.moves.urllib.parse import urlparse
 
 
 class Encryption(object):
@@ -121,17 +118,17 @@ def __getJwkKeySet(self, location):
         :returns:
             JWK key set found at given location.
         '''
-    try:
-        url = urlparse(location)
-        if url.scheme and url.netloc and url.path:
-            return requests.get(location).text
-        raise HyperwalletException('Failed to parse url from string = ' + location)
-    except:
-        if os.path.isfile(location):
-            with open(location) as f:
-                return f.read()
-        else:
-            raise HyperwalletException('Wrong JWK key set location path = ' + location)
+        try:
+            url = urlparse(location)
+            if url.scheme and url.netloc and url.path:
+                return requests.get(location).text
+            raise HyperwalletException('Failed to parse url from string = ' + location)
+        except Exception as e:
+            if os.path.isfile(location):
+                with open(location) as f:
+                    return f.read()
+            else:
+                raise HyperwalletException('Wrong JWK key set location path = ' + location)
 
     def __findJwkKeyByAlgorithm(self, jwkKeySet, algorithm):
         '''