Fix the ruok protocol under Python3: a bytes/unicode problem. However, the...

Fix the ruok protocol under Python3: a bytes/unicode problem. However, the doctest cases still don't pass because they have leading u prefixes in them.

src/ZEO/nagios.py

@@ -78,7 +78,7 @@ def check(addr, output_metrics, status, per):
     proto = s.recv(struct.unpack(">I", s.recv(4))[0])
     datas = s.recv(struct.unpack(">I", s.recv(4))[0])
     s.close()
-    data = json.loads(datas)
+    data = json.loads(datas.decode("ascii"))
     if not data:
         return warn("No storages")
 

src/ZEO/tests/testZEO.py

@@ -1332,7 +1332,7 @@ def test_ruok():
     >>> _ = writer.write(struct.pack(">I", 4)+b"ruok")
     >>> writer.close()
     >>> proto = s.recv(struct.unpack(">I", s.recv(4))[0])
-    >>> pprint.pprint(json.loads(s.recv(struct.unpack(">I", s.recv(4))[0])))
+    >>> pprint.pprint(json.loads(s.recv(struct.unpack(">I", s.recv(4))[0]).decode("ascii")))
     {u'1': {u'aborts': 0,
             u'active_txns': 0,
             u'commits': 1,

src/ZEO/zrpc/connection.py

@@ -632,8 +632,8 @@ class ManagedServerConnection(Connection):
         self.message_output(self.current_protocol)
 
     def recv_handshake(self, proto):
-        if proto == 'ruok':
-            self.message_output(json.dumps(self.mgr.ruok()))
+        if proto == b'ruok':
+            self.message_output(json.dumps(self.mgr.ruok()).encode("ascii"))
             self.poll()
             Connection.close(self)
         else:

src/ZEO/zrpc/smac.py

@@ -271,6 +271,9 @@ class SizedMessageAsyncConnection(asyncore.dispatcher):
                 if isinstance(message, six.binary_type):
                     size += self.__message_output(messages.pop(0), output)
                 elif isinstance(message, six.text_type):
+                    # XXX This can silently lead to data loss and client hangs
+                    # if asserts aren't enabled. Encountered this under Python3
+                    # and 'ruok' protocol
                     assert False, "Got a unicode message: %s" % repr(message)
                 elif message is _close_marker:
                     del messages[:]