clean up bundle_path code

1 files changed, 2 insertions, 15 deletions

diff --git a/IKnowMyABCs.py b/IKnowMyABCs.py
index 2598771..ba4b564 100644
--- a/IKnowMyABCs.py
+++ b/IKnowMyABCs.py
@@ -1,4 +1,4 @@
-#Copyright (c) 2012 Walter Bender
+#Copyright (c) 2012,13 Walter Bender
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,10 +25,6 @@ if _HAVE_TOOLBOX:
     from sugar.activity.widgets import StopButton
 
 from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.combobox import ComboBox
-from sugar.graphics.toolcombobox import ToolComboBox
-from sugar.datastore import datastore
-from sugar import profile
 
 from gettext import gettext as _
 import os.path
@@ -57,8 +53,6 @@ class IKnowMyABCs(activity.Activity):
         ''' Initialize the toolbars and the reading board '''
         super(IKnowMyABCs, self).__init__(handle)
 
-        self.datapath = get_path(activity, 'instance')
-
         if 'LANG' in os.environ:
             language = os.environ['LANG'][0:2]
         elif 'LANGUAGE' in os.environ:
@@ -69,14 +63,7 @@ class IKnowMyABCs(activity.Activity):
         # FIXME: find some reasonable default situation
         language = 'es'
 
-        home_path = os.path.expanduser('~')
-        if os.path.exists(os.path.join(home_path, 'Activities',
-                                       'IKnowMyABCs.activity')):
-            self.activity_path = os.path.join(home_path, 'Activities',
-                                       'IKnowMyABCs.activity')
-        else:
-            self.activity_path = os.path.abspath('.')
-
+        self.activity_path = activity.get_bundle_path()
         self._lessons_path = os.path.join(self.activity_path,
                                           'lessons', language)
         self._images_path = os.path.join(self.activity_path,