Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/tutorius/core.py
diff options
context:
space:
mode:
Diffstat (limited to 'tutorius/core.py')
-rw-r--r--tutorius/core.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tutorius/core.py b/tutorius/core.py
index f51c5fb..c583a1f 100644
--- a/tutorius/core.py
+++ b/tutorius/core.py
@@ -34,6 +34,9 @@ class Tutorial (object):
"""
Tutorial Class, used to run through the FSM.
"""
+ #Properties
+ probeManager = property(lambda self: self._probeMgr)
+ activityId = property(lambda self: self._activity_id)
def __init__(self, name, fsm, filename=None):
"""
@@ -53,9 +56,6 @@ class Tutorial (object):
self._activity_id = None
#Rest of initialisation happens when attached
- probeManager = property(lambda self: self._probeMgr)
- activityId = property(lambda self: self._activity_id)
-
def attach(self, activity_id):
"""
Attach to a running activity
@@ -79,7 +79,6 @@ class Tutorial (object):
# Uninstall the whole FSM
self.state_machine.teardown()
- #FIXME (Old) There should be some amount of resetting done here...
if not self._activity_id is None:
self._probeMgr.detach(self._activity_id)
self._activity_id = None
@@ -107,6 +106,7 @@ class Tutorial (object):
readfile = addon.create("ReadFile", filename=filename)
if readfile:
self._probeMgr.install(readfile)
+ #Uninstall now while we have the reference handy
self._probeMgr.uninstall(readfile)
class State(object):