Merge branch 'master' of ralfj.de:saartuer

diff --git a/statemachine.odg b/statemachine.odg
index a26f172981038c82c3d50b010000de977e4ac51c..3201b4288b15c73cc4c24aee8d92f4bf9333b7e6 100644 (file)
Binary files a/statemachine.odg and b/statemachine.odg differ

diff --git a/statemachine.py b/statemachine.py
index 5583cc6430ca1d3a19bcc830fb2786e7955886cc..70f9fe3e3cd942d16a992087bb8e76705a895138 100644 (file)
--- a/statemachine.py
+++ b/statemachine.py
@@ -136,7 +136,6 @@ class StateMachine():
        class AbstractStateWhereOpeningIsRedundant(State):
                def handle_open_event(self, callback):
                        # intentionally not calling super() implementation
-                       # FIXME contradicting original plan where open would be ignored in StateAboutToOpen?
                        callback("299 redundant: Space seems to be already open. Still processing your request tough.")
                        logger.warning("Received OPEN command in StateAboutToOpen. This should not be necessary.")
                        self.actor().act(Actor.CMD_OPEN)