ZEO stats monitor fixes.

zopefoundation · Mar 8, 2013 · f07858e · f07858e
1 parent ef2007c
commit f07858e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/ZEO/monitor.py b/src/ZEO/monitor.py
@@ -139,7 +139,7 @@ def readable(self):
     def handle_write(self):
         s = "".join(self.buf)
         self.buf = []
-        n = self.socket.send(s)
+        n = self.socket.send(s.encode('ascii'))
         if n < len(s):
             self.buf.append(s[:n])
 
@@ -184,8 +184,7 @@ def dump(self, f):
         print(time.ctime(), file=f)
         print(file=f)
 
-        L = self.stats.keys()
-        L.sort()
+        L = sorted(self.stats.keys())
         for k in L:
             stats = self.stats[k]
             print("Storage:", k, file=f)

diff --git a/src/ZEO/tests/testMonitor.py b/src/ZEO/tests/testMonitor.py
@@ -37,7 +37,7 @@ def get_monitor_output(self):
             else:
                 break
         s.close()
-        return "".join(L)
+        return b"".join(L).decode('ascii')
 
     def parse(self, s):
         # Return a list of StorageStats, one for each storage.