Add default JSON decoder function

citybuilder/player.py

@@ -75,7 +75,7 @@ class Player:
             'username': self.username,
             'jobs': [{ 'product': job.product, 'finish_time': job.finish_time } for job in self.jobs],
             'buildings': self.buildings,
-            'units': [unit.__dict__ for unit in self.units],
+            'units': self.units,
             'resources': self.resources,
             'resources_max': { key: self.get_storage_space(key) for key in self.resources.keys() },
             'research': self.research,

citybuilder/server.py

@@ -7,6 +7,9 @@ from citybuilder import core
 connections = {}
 players = {}
 
+def json_default(o):
+    return o.__dict__
+
 class MainServerSocket(WebSocket):
 
     def handleMessage(self):
@@ -39,7 +42,7 @@ class MainServerSocket(WebSocket):
             print(e)
 
     def send_json(self, data):
-        self.sendMessage(json.dumps(data))
+        self.sendMessage(json.dumps(data, default=json_default))
 
     def handleConnected(self):
         print(self.address, 'connected')