# HG changeset patch # User Neil Muller # Date 1358283461 -7200 # Node ID 2f74064bc779c891fe2143edd51bf33944544dca # Parent eca4d2fc11a46715ac647564add85b5a9042c83a Misc pep8 cleanups diff -r eca4d2fc11a4 -r 2f74064bc779 gamelib/scenes/engine.py --- 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()) diff -r eca4d2fc11a4 -r 2f74064bc779 gamelib/scenes/machine.py --- 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. " diff -r eca4d2fc11a4 -r 2f74064bc779 gamelib/tests/test_walkthrough.py --- 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') diff -r eca4d2fc11a4 -r 2f74064bc779 pyntnclick/constants.py --- 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) - diff -r eca4d2fc11a4 -r 2f74064bc779 pyntnclick/tests/game_logic_utils.py --- 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]