websocket- shard support, fix for python3 (bytes!)

Author: tedivm

screepsapi/screepsapi.py

@@ -290,13 +290,13 @@ def subscribe(self, watchpoint):
     def set_subscriptions(self):
         pass
 
-    def process_log(self, ws, message):
+    def process_log(self, ws, message, shard='shard0'):
         pass
 
-    def process_results(self, ws, message):
+    def process_results(self, ws, message, shard='shard0'):
         pass
 
-    def process_error(self, ws, message):
+    def process_error(self, ws, message, shard='shard0'):
         pass
 
     def process_cpu(self, ws, data):
@@ -315,7 +315,7 @@ def on_message(self, ws, message):
             return
 
         if (message.startswith('gz')):
-            message = zlib.decompress(b64decode(message[3:]), 0)
+            message = zlib.decompress(b64decode(message[3:]), 0).decode('utf-8')
 
         try:
             self.process_message(ws, message)
@@ -328,20 +328,24 @@ def on_message(self, ws, message):
                 return
 
             if data[0].endswith('console'):
+                if 'shard' in data[1]:
+                    shard = data[1]['shard']
+                else:
+                    shard = 'shard0'
 
                 if 'messages' in data[1]:
                     stream = []
 
                     if 'log' in data[1]['messages']:
                         for line in data[1]['messages']['log']:
-                            self.process_log(ws, line)
+                            self.process_log(ws, line, shard)
 
                     if 'results' in data[1]['messages']:
                         for line in data[1]['messages']['results']:
-                            self.process_results(ws, line)
+                            self.process_results(ws, line, shard)
 
                 if 'error' in data[1]:
-                    self.process_error(ws, data[1]['error'])
+                    self.process_error(ws, data[1]['error'], shard)
 
             if data[0].endswith('cpu'):
                 self.process_cpu(ws, data[1])

setup.py

@@ -8,7 +8,7 @@
     long_description = open('README.md').read()
 
 
-version = '0.4.2'
+version = '0.4.3'
 setup(
   name = 'screepsapi',
   version = version,