Mercurial > pyntnclick

changeset 731:2f74064bc779 pyntnclick

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Misc pep8 cleanups
author Neil Muller <neil@dip.sun.ac.za>
date Tue, 15 Jan 2013 22:57:41 +0200
parents eca4d2fc11a4
children 4f34b36ee7c5
files gamelib/scenes/engine.py gamelib/scenes/machine.py gamelib/tests/test_walkthrough.py pyntnclick/constants.py pyntnclick/tests/game_logic_utils.py
diffstat 5 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/scenes/engine.py	Tue Jan 15 22:56:30 2013 +0200
+++ b/gamelib/scenes/engine.py	Tue Jan 15 22:57:41 2013 +0200
@@ -123,8 +123,8 @@
         ))
 
     def engine_online_check(self):
-        if self.things['engine.cryo_containers'].get_data('filled') \
-                and  self.things['engine.superconductor'].get_data('working'):
+        if (self.things['engine.cryo_containers'].get_data('filled')
+                and self.things['engine.superconductor'].get_data('working')):
             self.set_data('engine online', True)
             self.remove_thing(self.things['engine.engines.8'])
             self.add_thing(Engines())
--- a/gamelib/scenes/machine.py	Tue Jan 15 22:56:30 2013 +0200
+++ b/gamelib/scenes/machine.py	Tue Jan 15 22:57:41 2013 +0200
@@ -144,7 +144,7 @@
             msg = "The laser welder looks hungry, somehow."
             if "can" in contents:
                 msg += " It currently contains an empty can."
-            elif  "tube" in contents:
+            elif "tube" in contents:
                 msg += " It currently contains a tube fragment."
         elif len(contents) == 2:
             msg = "The laser welder looks expectant. "
--- a/gamelib/tests/test_walkthrough.py	Tue Jan 15 22:56:30 2013 +0200
+++ b/gamelib/tests/test_walkthrough.py	Tue Jan 15 22:57:41 2013 +0200
@@ -301,4 +301,5 @@
         self.assert_game_data('tab', 'nav', detail='bridge_comp_detail')
 
         # Go somewhere interesting.
-        self.interact_thing('bridge_comp.nav_line2', detail='bridge_comp_detail')
+        self.interact_thing('bridge_comp.nav_line2',
+                detail='bridge_comp_detail')
--- a/pyntnclick/constants.py	Tue Jan 15 22:56:30 2013 +0200
+++ b/pyntnclick/constants.py	Tue Jan 15 22:57:41 2013 +0200
@@ -39,4 +39,3 @@
     button_disabled_color = (0x66, 0x66, 0x66, 0xFF)
 
     modal_obscure_color = (0, 0, 0, 0xB0)
-
--- a/pyntnclick/tests/game_logic_utils.py	Tue Jan 15 22:56:30 2013 +0200
+++ b/pyntnclick/tests/game_logic_utils.py	Tue Jan 15 22:57:41 2013 +0200
@@ -37,7 +37,8 @@
             gizmo = gizmo.things[thing]
         gizmo.set_data(key, value)
 
-    def assert_game_data(self, key, value, thing=None, scene=None, detail=None):
+    def assert_game_data(self, key, value, thing=None, scene=None,
+            detail=None):
         gizmo = self.state.current_scene
         if scene is not None:
             gizmo = self.state.scenes[scene]