From af28198fb4aca5f07befe960e72320bc01505e66 Mon Sep 17 00:00:00 2001 From: Ignacio Rodriguez Date: Tue, 24 Dec 2013 15:49:08 +0000 Subject: some fixes --- diff --git a/sugargame/util.py b/sugargame/util.py index 63685c8..0f9d1e1 100644 --- a/sugargame/util.py +++ b/sugargame/util.py @@ -5,34 +5,33 @@ import os import os.path from sugar3.activity.activity import get_bundle_path -NON_SUGAR_ROOT = '~/.sugar/default/olpcgames' - def get_activity_root(): - """Return the activity root for data storage operations - - If the activity is present, returns the activity's root, - otherwise returns NON_SUGAR_ROOT as the directory. + """ + Return the activity root for data storage operations """ import sugargame if sugargame.ACTIVITY: return sugargame.ACTIVITY.get_activity_root() - else: - return os.path.expanduser(NON_SUGAR_ROOT) def data_path(file_name): - """Return the full path to a file in the data sub-directory of the bundle""" + """ + Return the full path to a file in the data sub-directory of the bundle + """ return os.path.join(get_bundle_path(), 'data', file_name) def tmp_path(file_name): - """Return the full path to a file in the temporary directory""" + """ + Return the full path to a file in the temporary directory + """ return os.path.join(get_activity_root(), 'tmp', file_name) def get_traceback(error): - """Get formatted traceback from current exception + """ + Get formatted traceback from current exception error -- Exception instance raised -- cgit v0.9.1