Use newstr from future

Author: tume

mrq/basetasks/cleaning.py

@@ -1,3 +1,4 @@
+from builtins import str
 from mrq.queue import Queue
 from mrq.task import Task
 from mrq.job import Job

mrq/basetasks/utils.py

@@ -1,5 +1,6 @@
 from __future__ import print_function
 from future.utils import itervalues
+from builtins import str
 from mrq.task import Task
 from mrq.queue import Queue
 from bson import ObjectId

mrq/bin/mrq_worker.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import os
+from builtins import str
 
 # Needed to make getaddrinfo() work in pymongo on Mac OS X
 # Docs mention it's a better choice for Linux as well.

mrq/config.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from builtins import str
 import argparse
 import os
 import sys

mrq/context.py

@@ -2,6 +2,7 @@
 standard_library.install_aliases()
 from builtins import next
 from builtins import map
+from past.builtins import basestring
 from .logger import Logger
 import gevent
 import gevent.pool
@@ -112,7 +113,7 @@ def versiontuple(v):
         return tuple(map(int, (v.split("."))))
 
     if attr.startswith("redis"):
-        if type(config_obj) in [str]:
+        if isinstance(config_obj, basestring):
 
             import redis as pyredis
 
@@ -139,7 +140,7 @@ def versiontuple(v):
 
     elif attr.startswith("mongodb"):
 
-        if type(config_obj) in [str]:
+        if isinstance(config_obj, basestring):
 
             if attr == "mongodb_logs" and config_obj == "1":
                 return connections.mongodb_jobs

mrq/queue.py

@@ -111,7 +111,7 @@ 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).decode('utf-8') for x in job_ids]
+            return [binascii.hexlify(x).decode('ascii') for x in job_ids]
 
     def size(self):
         """ Returns the total number of jobs on the queue """

tests/test_interrupts.py

@@ -1,5 +1,6 @@
 import time
 import datetime
+from builtins import str
 from mrq.job import Job
 from mrq.queue import Queue
 from bson import ObjectId