Merge branch 'master' of https://github.com/battlecode/battlecode-2018

battlecode · Jan 14, 2018 · b655ea6 · b655ea6
2 parents 7aa88a0 + cb4dbfd
commit b655ea6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/battlecode-manager/battlecode_cli.py b/battlecode-manager/battlecode_cli.py
@@ -86,7 +86,8 @@ def run_game(game, dockers, args, sock_file, scrimmage=False):
                 team = 'blue'
             else:
                 team = 'red'
-            name = f'[{planet}:{team}]'
+
+            name = '[{}:{}]'.format(planet, team)
             logger = Logger(name, print=(not args['terminal_viewer'] and not scrimmage))
             docker_inst.stream_logs(line_action=logger)
             player_['logger'] = logger

diff --git a/battlecode-manager/server.py b/battlecode-manager/server.py
@@ -428,7 +428,7 @@ def message(self, state_diff):
             else:
                 logged_in = "false"
 
-            message = f'{{"logged_in":{logged_in},"client_id":"{self.client_id}","error":{error},"message":{state_diff}}}'
+            message = '{{"logged_in":{},"client_id":"{}","error":{},"message":{}}}'.format(logged_in, self.client_id, error, state_diff)
             return message
 
         def player_handler(self):