NF: Remove command line arg for --rainbow. Use envvar.

ASPP · Aug 28, 2017 · 8b0fc96 · 8b0fc96
1 parent 4ad6c19
commit 8b0fc96
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/pelita/libpelita.py b/pelita/libpelita.py
@@ -237,7 +237,7 @@ def channel_setup(publish_to=None, reply_to=None):
     yield { "publisher": publisher, "controller": controller }
 
 
-def run_external_viewer(subscribe_sock, controller, geometry, delay, rainbow):
+def run_external_viewer(subscribe_sock, controller, geometry, delay):
     # Something on OS X prevents Tk from running in a forked process.
     # Therefore we cannot use multiprocessing here. subprocess works, though.
     viewer_args = [ str(subscribe_sock) ]
@@ -247,8 +247,6 @@ def run_external_viewer(subscribe_sock, controller, geometry, delay, rainbow):
         viewer_args += ["--geometry", "{0}x{1}".format(*geometry)]
     if delay:
         viewer_args += ["--delay", str(delay)]
-    if rainbow:
-        viewer_args += ["--rainbow"]
 
     tkviewer = 'pelita.scripts.pelita_tkviewer'
     external_call = [get_python_process(),

diff --git a/pelita/scripts/pelita_main.py b/pelita/scripts/pelita_main.py
@@ -182,8 +182,6 @@ def geometry_string(s):
                         dest='viewer', help='use the unsynchronised tk viewer')
 parser.set_defaults(viewer='tk')
 
-parser.add_argument('--rainbow', action='store_const', const=True, help=argparse.SUPPRESS)
-
 layout_opt = parser.add_mutually_exclusive_group()
 layout_opt.add_argument('--layoutfile', metavar='FILE',
                         help='load a maze layout from FILE')
@@ -391,7 +389,7 @@ def main():
                 controller = channels["controller"]
                 publisher = channels["publisher"]
                 game_config["publisher"] = publisher
-                viewer = libpelita.run_external_viewer(publisher.socket_addr, controller.socket_addr, geometry=geometry, delay=delay, rainbow=args.rainbow)
+                viewer = libpelita.run_external_viewer(publisher.socket_addr, controller.socket_addr, geometry=geometry, delay=delay)
                 libpelita.run_game(team_specs=team_specs, game_config=game_config, viewers=viewers, controller=controller)
             else:
                 libpelita.run_game(team_specs=team_specs, game_config=game_config, viewers=viewers)

diff --git a/pelita/scripts/pelita_tkviewer.py b/pelita/scripts/pelita_tkviewer.py
@@ -27,7 +27,6 @@ def geometry_string(s):
                     help='geometry')
 parser.add_argument('--delay', type=int,
                     help='delay')
-parser.add_argument('--rainbow', action='store_const', const=True, help=argparse.SUPPRESS)
 
 
 def main():
@@ -36,8 +35,7 @@ def main():
         'address': args.subscribe_sock,
         'controller_address': args.controller_address,
         'geometry': args.geometry,
-        'delay': args.delay,
-        'rainbow': args.rainbow
+        'delay': args.delay
     }
     v = TkViewer(**{k: v for k, v in list(tkargs.items()) if v is not None})
     v.run()

diff --git a/pelita/ui/tk_viewer.py b/pelita/ui/tk_viewer.py
@@ -70,14 +70,18 @@ class TkViewer:
     app : The TkApplication class
 
     """
-    def __init__(self, address, controller_address=None, geometry=None, delay=1, rainbow=False):
+    def __init__(self, address, controller_address=None, geometry=None, delay=1):
         self.address = address
         self.controller_address = controller_address
         self.delay = delay
         self.geometry = geometry
-        self.rainbow = rainbow
+
+        if os.getenv("PELITA_DOUBLE_RAINBOW", None):
+            self.rainbow = True
 
     def run(self):
+        import os
+
         self.root = tkinter.Tk()
         if self.geometry is None:
             root_geometry = '900x510'