From 87b5ff04ba894dcbbcc10715b52393a36c90fdf5 Mon Sep 17 00:00:00 2001
From: Simon Howard <fraggle@gmail.com>
Date: Thu, 21 Jan 2016 05:08:52 +0000
Subject: [PATCH] Encode/decode as utf8.

I believe this fixed a bug that was occurring some time back.
---
 chocolate-master | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chocolate-master b/chocolate-master
index ca5e942..b788ded 100755
--- a/chocolate-master
+++ b/chocolate-master
@@ -78,7 +78,7 @@ def read_string(packet):
 
     result, = struct.unpack("%ss" % strlen, packet[0:strlen])
 
-    return packet[strlen + 1:], result
+    return packet[strlen + 1:], result.decode('utf8')
 
 class Server:
     """ A server that has registered itself. """
@@ -292,7 +292,7 @@ class MasterServer:
         def metadata_string(server):
             metadata = server.metadata.copy()
             metadata["age"] = server.age()
-            return simplejson.dumps(metadata)
+            return simplejson.dumps(metadata).encode('utf8')
 
         # Generate a list of strings containing JSON-encoded metadata
         # about servers.  Only include verified servers.