Skip to content

Python3 compatibility #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tcztzy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Python3 compatibility #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ Usage
}

res = client.call(method, params)

2 changes: 1 addition & 1 deletion jos/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ def call(self, method, app_params=None):
params['sign'] = sign(self.secret, params)
res = requests.get(self.BASE_URL, params=params)
res.raise_for_status()
return json.loads(res.content, strict=False)
return json.loads(res.content.decode('utf-8'), strict=False)
7 changes: 3 additions & 4 deletions jos/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ def sign(secret, params):
:param params: parameters which are required to generate valid signature.
should be a dict.
"""
keys = params.keys()
keys.sort()
keys = sorted(params.keys())

p_string = ''.join('%s%s' % (key, params[key]) for key in keys)
p_string = ''.join([secret, p_string, secret])

sign = hashlib.md5(p_string).hexdigest().upper()
s = hashlib.md5(p_string.encode(encoding='utf-8')).hexdigest().upper()

return sign
return s