1 files changed, 6 insertions, 7 deletions
diff --git a/tutorius/core.py b/tutorius/core.py
index b24b80b..bfbe07b 100644
--- a/tutorius/core.py
+++ b/tutorius/core.py
@@ -24,9 +24,9 @@ This module contains the core classes for tutorius
 import logging
 import os
 
-from sugar.tutorius.TProbe import ProbeManager
-from sugar.tutorius.dbustools import save_args
-from sugar.tutorius import addon
+from .TProbe import ProbeManager
+from .dbustools import save_args
+from . import addon
 
 logger = logging.getLogger("tutorius")
 
@@ -505,10 +505,9 @@ class FiniteStateMachine(State):
             
             #TODO : Move this code inside the State itself - we're breaking
             # encap :P
-            if st._transitions:
-                for event, state in st._transitions.items():
-                    if state == state_name:
-                        del st._transitions[event]
+            for event in st._transitions:
+                if st._transitions[event] == state_name:
+                    del st._transitions[event]
         
         # Remove the state from the dictionary
         del self._states[state_name]