From a4db2b11e83f8c8fb53e3723f47e028f0c23462d Mon Sep 17 00:00:00 2001 From: Adrien Chauve Date: Sat, 24 Dec 2016 19:10:38 +0100 Subject: [PATCH 1/2] Relax gevent pip requirement to allow using gevent 1.2 (for python 3.5/3.6) --- requirements-base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-base.txt b/requirements-base.txt index 60d8e4f8..9653a73d 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -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 From 421428d38336caff02565b59420584f5d1245fe7 Mon Sep 17 00:00:00 2001 From: Adrien Chauve Date: Sat, 24 Dec 2016 21:58:26 +0100 Subject: [PATCH 2/2] Fix bug because of str different meaning in py2 and py3 --- mrq/queue.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mrq/queue.py b/mrq/queue.py index 5ee75118..c797d306 100644 --- a/mrq/queue.py +++ b/mrq/queue.py @@ -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): """