Commit 1f60a7e7 authored by André Anjos's avatar André Anjos 💬
Browse files

Fix decoding issues on py3k

parent 0515644d
Pipeline #19468 passed with stages
in 59 minutes and 54 seconds
......@@ -85,7 +85,7 @@ def load_schema(schema_name, version=1):
os.path.join(schema_name, '%d.json' % version))
with open(fname, 'rb') as f:
data = f.read().decode("utf-8")
data = f.read().decode()
schema = simplejson.loads(data)
basedir = os.path.realpath(os.path.dirname(fname))
......
......@@ -144,10 +144,10 @@ class ControllerProcess(multiprocessing.Process):
self.queue.put('STARTED')
def onWorkerReady(name):
self.queue.put('READY %s' % name)
self.queue.put('READY %s' % name.decode())
def onWorkerGone(name):
self.queue.put('GONE %s' % name)
self.queue.put('GONE %s' % name.decode())
self.controller = WorkerController(
'127.0.0.1',
......@@ -250,7 +250,7 @@ class TestWorkerBase(unittest.TestCase):
args = [
'--prefix=%s' % prefix,
'--cache=%s' % tmp_prefix,
'--name=%s' % name.decode('utf-8'),
'--name=%s' % name.decode(),
# '-vv',
self.controller.address if address is None else address,
]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment