Added support for python 3

claudiosanches · claudiosanches · commit 85521426d5b7 · 2015-07-12T14:55:13.000-03:00
diff --git a/woocommerce/api.py b/woocommerce/api.py
@@ -9,8 +9,8 @@
 __author__ = "Claudio Sanches @ WooThemes"
 __license__ = "MIT"
 
-import requests
-import json
+from requests import request
+from json import dumps as jsonencode
 from woocommerce.oauth import OAuth
 
 
@@ -66,9 +66,9 @@ def __request(self, method, endpoint, data):
             url = self.__get_oauth_url(url, method)
 
         if data is not None:
-            data = json.dumps(data, ensure_ascii=False)
+            data = jsonencode(data, ensure_ascii=False)
 
-        return requests.request(
+        return request(
             method=method,
             url=url,
             verify=self.verify_ssl,
diff --git a/woocommerce/oauth.py b/woocommerce/oauth.py
@@ -9,13 +9,22 @@
 __author__ = "Claudio Sanches @ WooThemes"
 __license__ = "MIT"
 
-import urlparse
-import time
-import random
-import hmac
-import urllib
-import hashlib
-import collections
+from time import time
+from random import randint
+from hmac import new as HMAC
+from hashlib import sha1, sha256
+from collections import OrderedDict
+from base64 import b64encode
+
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
+
+try:
+    from urllib import urlencode, quote, unquote
+except ImportError:
+    from urllib.parse import urlencode, quote, unquote
 
 
 class OAuth(object):
@@ -40,13 +49,16 @@ def get_oauth_url(self):
             url = self.url
 
         params["oauth_consumer_key"] = self.consumer_key
-        params["oauth_timestamp"] = int(time.time())
-        params["oauth_nonce"] = hmac.new(
-            str(time.time() + random.randint(0, 99999)), "SHA1").hexdigest()
+        params["oauth_timestamp"] = int(time())
+        params["oauth_nonce"] = HMAC(
+            str(time() + randint(0, 99999)).encode(),
+            "secret".encode(),
+            sha1
+        ).hexdigest()
         params["oauth_signature_method"] = "HMAC-SHA256"
         params["oauth_signature"] = self.generate_oauth_signature(params, url)
 
-        query_string = urllib.urlencode(params)
+        query_string = urlencode(params)
 
         return "%s?%s" % (url, query_string)
 
@@ -55,9 +67,9 @@ def generate_oauth_signature(self, params, url):
         if "oauth_signature" in params.keys():
             del params["oauth_signature"]
 
-        base_request_uri = urllib.quote(url, "")
+        base_request_uri = quote(url, "")
         params = self.normalize_parameters(params)
-        params = collections.OrderedDict(sorted(params.items()))
+        params = OrderedDict(sorted(params.items()))
         query_params = ["{param_key}%3D{param_value}".format(param_key=key, param_value=value)
                         for key, value in params.items()]
 
@@ -68,12 +80,13 @@ def generate_oauth_signature(self, params, url):
         if self.version == "v3":
             consumer_secret += "&"
 
-        hash_signature = hmac.new(
-            consumer_secret,
-            str(string_to_sign),
-            getattr(hashlib, "sha256")).digest()
+        hash_signature = HMAC(
+            consumer_secret.encode(),
+            str(string_to_sign).encode(),
+            sha256
+        ).digest()
 
-        return hash_signature.encode("base64").replace("\n", "")
+        return b64encode(hash_signature).decode("utf-8").replace("\n", "")
 
     @staticmethod
     def normalize_parameters(params):
@@ -82,8 +95,13 @@ def normalize_parameters(params):
         normalized_parameters = {}
 
         def get_value_like_as_php(val):
-            """ Prepare value for urllib.quote """
-            if isinstance(val, basestring):
+            """ Prepare value for quote """
+            try:
+                base = basestring
+            except NameError:
+                base = (str, bytes)
+
+            if isinstance(val, base):
                 return val
             elif isinstance(val, bool):
                 return "1" if val else ""
@@ -96,8 +114,8 @@ def get_value_like_as_php(val):
 
         for key, value in params.items():
             value = get_value_like_as_php(value)
-            key = urllib.quote(urllib.unquote(str(key))).replace("%", "%25")
-            value = urllib.quote(urllib.unquote(str(value))).replace("%", "%25")
+            key = quote(unquote(str(key))).replace("%", "%25")
+            value = quote(unquote(str(value))).replace("%", "%25")
             normalized_parameters[key] = value
 
         return normalized_parameters
