From 0db118e6320d157748fad0b4d7a31beebcf5b301 Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Wed, 04 Nov 2009 15:20:30 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/tutorius/mainline

---
(limited to 'tutorius/vault.py')

diff --git a/tutorius/vault.py b/tutorius/vault.py
index 9215e8d..b455a52 100644
--- a/tutorius/vault.py
+++ b/tutorius/vault.py
@@ -28,11 +28,11 @@ import uuid
 import xml.dom.minidom
 from xml.dom import NotFoundErr
 import zipfile
-
-from sugar.tutorius import addon
-from sugar.tutorius.core import Tutorial, State, FiniteStateMachine
 from ConfigParser import SafeConfigParser
 
+from . import addon
+from .core import Tutorial, State, FiniteStateMachine
+
 logger = logging.getLogger("tutorius")
 
 # this is where user installed/generated tutorials will go
@@ -73,7 +73,7 @@ class Vault(object):
         given activity.
 
         @param activity_name the name of the activity associated with this tutorial. None means ALL activities
-        @param activity_vers the version number of the activity to find tutorail for. 0 means find for ANY version. Ifactivity_ame is None, version number is not used
+        @param activity_vers the version number of the activity to find tutorail for. 0 means find for ANY version. If activity_name is None, version number is not used
         @returns a map of tutorial {names : GUID}.
         """
         # check both under the activity data and user installed folders
@@ -835,8 +835,7 @@ class TutorialBundler(object):
         raise IOError(2, "Neither the global nor the bundle directory contained the tutorial with GUID %s"%guid)
     
     
-    @staticmethod
-    def write_fsm(fsm):
+    def write_fsm(self, fsm):
 
         """
         Save fsm to disk. If a GUID parameter is provided, the existing GUID is
--
cgit v0.9.1