Skip to content

Commit c589281

Browse files
committedApr 12, 2017
add python 3 support
1 parent 65a680e commit c589281

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed
 

‎Veridu/SDK/API.py

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
import urlparse
2-
import urllib
1+
import sys
2+
if sys.version_info > (2, 7):
3+
from urllib.parse import urlencode, urljoin
4+
else:
5+
from urlparse import urljoin
6+
from urllib import urlencode
37
import requests
48
import random
59
import time
@@ -16,7 +20,10 @@ class API(object):
1620

1721
def __init__(self, key, secret, version="0.3"):
1822
self.key = key
19-
self.secret = secret
23+
if sys.version_info > (2, 7):
24+
self.secret = secret.encode('utf-8')
25+
else:
26+
self.secret = secret
2027
self.version = version
2128
self.session = None
2229
self.headers = {
@@ -46,13 +53,15 @@ def createSignature(self, method, url):
4653
"timestamp": int(time.time()),
4754
"version": self.version
4855
}
49-
payload = urllib.urlencode(collections.OrderedDict(sorted(rawPayload.items())))
56+
payload = urlencode(collections.OrderedDict(sorted(rawPayload.items())))
57+
if sys.version_info > (2, 7):
58+
payload = payload.encode('utf-8')
5059
hmacInstance = hmac.new(self.secret, msg=payload, digestmod=hashlib.sha1)
5160
rawPayload["signature"] = hmacInstance.hexdigest()
5261
return rawPayload
5362

5463
def fetch(self, method, resource, data=None):
55-
baseUrl = urlparse.urljoin("https://api.veridu.com", "/%s/%s" % (self.version, resource))
64+
baseUrl = urljoin("https://api.veridu.com", "/%s/%s" % (self.version, resource))
5665

5766
if (method == "GET"):
5867
response = requests.get(baseUrl, params=data, headers=self.headers)
@@ -78,7 +87,7 @@ def fetch(self, method, resource, data=None):
7887
def signedFetch(self, method, resource, data=None):
7988
sign = self.createSignature(
8089
method,
81-
urlparse.urljoin("https://api.veridu.com", "/%s/%s" % (self.version, resource))
90+
urljoin("https://api.veridu.com", "/%s/%s" % (self.version, resource))
8291
)
8392

8493
if data is None:

0 commit comments

Comments
 (0)
Please sign in to comment.