Class renaming.

diff --git a/client.py b/client.py
index dd40323fca7038e45f8684bd1f34bd086e96523d..07d59c235c5a2b21f9b3ff7ba90c6f29b75a86e2 100755 (executable)
--- a/client.py
+++ b/client.py
@@ -4,10 +4,10 @@ import plom_socket_io
 import socket
 import threading
 from parser import ArgError, Parser
-from game_common import World, Commander
+from game_common import World, CommonCommandsMixin
 
 
-class Game(Commander):
+class Game(CommonCommandsMixin):
     world = World()
     log_text = ''
 

diff --git a/game_common.py b/game_common.py
index 689398ddbce3cd85f93e7bcee5cbd1d2ce9e8c0a..39a12f1612f0cbd15d342a82c88c26feace90dde 100644 (file)
--- a/game_common.py
+++ b/game_common.py
@@ -52,7 +52,7 @@ class Thing:
         self.position = [0,0]
 
 
-class Commander:
+class CommonCommandsMixin:
 
     def cmd_MAP_SIZE(self, yx):
         """Set self.map_size to yx, redraw self.terrain_map as '?' cells."""

diff --git a/server_/game.py b/server_/game.py
index c881f8e2ad98c2aa62b62cd742e5e45226aae18f..e2a1187c9455ee0dac896605101ec5ec9daa8fb4 100644 (file)
--- a/server_/game.py
+++ b/server_/game.py
@@ -193,7 +193,7 @@ def fib(n):
         return fib(n-1) + fib(n-2)
 
 
-class Game(game_common.Commander):
+class Game(game_common.CommonCommandsMixin):
 
     def __init__(self, game_file_name):
         import server_.io