Skip to content

Fix unicode bug for py2 #142

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

Merged
sylvinus merged 2 commits into from
Jan 2, 2017
Merged

Fix unicode bug for py2 #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4db2b1
Relax gevent pip requirement to allow using gevent 1.2 (for python 3.…
Dec 24, 2016
421428d
Fix bug because of str different meaning in py2 and py3
Dec 24, 2016
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
3 changes: 2 additions & 1 deletion mrq/queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ def unserialize_job_ids(self, job_ids):
if len(job_ids) == 0 or self.use_large_ids:
return job_ids
else:
return [binascii.hexlify(x.encode('utf-8') if isinstance(x, str) else x).decode('ascii') for x in job_ids]
return [binascii.hexlify(x.encode('utf-8') if (PY3 and isinstance(x, str)) else x).decode('ascii')
for x in job_ids]

def _get_pausable_id(self):
"""
Expand Down
2 changes: 1 addition & 1 deletion requirements-base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
argparse>=1.1
redis>=2.10.5
pymongo>=3.0.1
gevent==1.1.1
gevent>=1.1.1
ujson==1.33
hiredis>=0.1.5
psutil==1.2.1
Expand Down