From 827b74b917e7c0b09096c53c0089b497899d7aa8 Mon Sep 17 00:00:00 2001 From: Vincent Vinet Date: Wed, 28 Oct 2009 00:33:13 +0000 Subject: make tutorius imports relative --- diff --git a/addons/bubblemessage.py b/addons/bubblemessage.py index 2bd2d31..6572a6a 100644 --- a/addons/bubblemessage.py +++ b/addons/bubblemessage.py @@ -13,10 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.actions import Action, DragWrapper -from sugar.tutorius.properties import TStringProperty, TArrayProperty -from sugar.tutorius import overlayer -from sugar.tutorius.services import ObjectStore +from ..actions import Action, DragWrapper +from ..properties import TStringProperty, TArrayProperty +from .. import overlayer +from ..services import ObjectStore class BubbleMessage(Action): message = TStringProperty("Message") diff --git a/addons/chainaction.py b/addons/chainaction.py index 43c4fa4..8df7ac8 100644 --- a/addons/chainaction.py +++ b/addons/chainaction.py @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.actions import * +from ..actions import * class ChainAction(Action): actions = TAddonListProperty() diff --git a/addons/clickaction.py b/addons/clickaction.py index 828dd75..88c5519 100644 --- a/addons/clickaction.py +++ b/addons/clickaction.py @@ -14,8 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius import gtkutils -from sugar.tutorius.actions import * +from .. import gtkutils +from ..actions import * class ClickAction(Action): """ diff --git a/addons/dialogmessage.py b/addons/dialogmessage.py index f15f256..9250693 100644 --- a/addons/dialogmessage.py +++ b/addons/dialogmessage.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.actions import * +from ..actions import * class DialogMessage(Action): message = TStringProperty("Message") diff --git a/addons/disablewidget.py b/addons/disablewidget.py index ce3f235..fd88303 100644 --- a/addons/disablewidget.py +++ b/addons/disablewidget.py @@ -14,9 +14,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.actions import * -from sugar.tutorius import gtkutils -from sugar.tutorius.services import ObjectStore +from ..actions import * +from .. import gtkutils +from ..services import ObjectStore class DisableWidgetAction(Action): target = TStringProperty("0") diff --git a/addons/gtkwidgeteventfilter.py b/addons/gtkwidgeteventfilter.py index 8d8ff38..65aa744 100644 --- a/addons/gtkwidgeteventfilter.py +++ b/addons/gtkwidgeteventfilter.py @@ -13,9 +13,9 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.filters import EventFilter -from sugar.tutorius.properties import TUAMProperty, TEventType -from sugar.tutorius.gtkutils import find_widget +from ..filters import EventFilter +from ..properties import TUAMProperty, TEventType +from ..gtkutils import find_widget class GtkWidgetEventFilter(EventFilter): """ diff --git a/addons/gtkwidgettypefilter.py b/addons/gtkwidgettypefilter.py index 816a754..4ffecb5 100644 --- a/addons/gtkwidgettypefilter.py +++ b/addons/gtkwidgettypefilter.py @@ -14,10 +14,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.filters import * -from sugar.tutorius.properties import * -from sugar.tutorius.services import ObjectStore -from sugar.tutorius.gtkutils import find_widget +from ..filters import * +from ..properties import * +from ..services import ObjectStore +from ..gtkutils import find_widget import logging logger = logging.getLogger("GtkWidgetTypeFilter") diff --git a/addons/oncewrapper.py b/addons/oncewrapper.py index 97f4752..5db3b60 100644 --- a/addons/oncewrapper.py +++ b/addons/oncewrapper.py @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.actions import * +from ..actions import * class OnceWrapper(Action): """ diff --git a/addons/readfile.py b/addons/readfile.py index 0d276b9..9fe2f81 100644 --- a/addons/readfile.py +++ b/addons/readfile.py @@ -16,9 +16,9 @@ import os -from sugar.tutorius.actions import Action -from sugar.tutorius.properties import TFileProperty -from sugar.tutorius.services import ObjectStore +from ..actions import Action +from ..properties import TFileProperty +from ..services import ObjectStore class ReadFile(Action): filename = TFileProperty(None) diff --git a/addons/timerevent.py b/addons/timerevent.py index c7374d0..752a865 100644 --- a/addons/timerevent.py +++ b/addons/timerevent.py @@ -16,8 +16,8 @@ import gobject -from sugar.tutorius.filters import EventFilter -from sugar.tutorius.properties import TIntProperty +from ..filters import EventFilter +from ..properties import TIntProperty class TimerEvent(EventFilter): """ diff --git a/addons/triggereventfilter.py b/addons/triggereventfilter.py index 6a0c2c9..19544b0 100644 --- a/addons/triggereventfilter.py +++ b/addons/triggereventfilter.py @@ -14,8 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.filters import * -from sugar.tutorius.properties import * +from ..filters import * +from ..properties import * class TriggerEventFilter(EventFilter): """ diff --git a/addons/typetextaction.py b/addons/typetextaction.py index fee66e5..8b746e6 100644 --- a/addons/typetextaction.py +++ b/addons/typetextaction.py @@ -14,8 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.actions import * -from sugar.tutorius import gtkutils +from ..actions import * +from .. import gtkutils class TypeTextAction(Action): """ diff --git a/addons/widgetidentifyaction.py b/addons/widgetidentifyaction.py index 3c66211..3df244b 100644 --- a/addons/widgetidentifyaction.py +++ b/addons/widgetidentifyaction.py @@ -14,9 +14,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.actions import * +from ..actions import * -from sugar.tutorius.editor import WidgetIdentifier +from ..editor import WidgetIdentifier class WidgetIdentifyAction(Action): def __init__(self): diff --git a/tutorius/TProbe.py b/tutorius/TProbe.py index e18ed67..867ef1c 100644 --- a/tutorius/TProbe.py +++ b/tutorius/TProbe.py @@ -8,12 +8,12 @@ import dbus import dbus.service import cPickle as pickle -import sugar.tutorius.addon as addon -from sugar.tutorius.services import ObjectStore -from sugar.tutorius.properties import TPropContainer +from . import addon +from .services import ObjectStore +from .properties import TPropContainer -from sugar.tutorius.dbustools import remote_call, save_args +from .dbustools import remote_call, save_args import copy """ diff --git a/tutorius/actions.py b/tutorius/actions.py index 08f55cd..bb15459 100644 --- a/tutorius/actions.py +++ b/tutorius/actions.py @@ -20,11 +20,12 @@ import gtk from gettext import gettext as _ -from sugar.tutorius import addon -from sugar.tutorius.services import ObjectStore -from sugar.tutorius.properties import * from sugar.graphics import icon +from . import addon +from .services import ObjectStore +from .properties import * + class DragWrapper(object): """Wrapper to allow gtk widgets to be dragged around""" def __init__(self, widget, position, draggable=False): diff --git a/tutorius/core.py b/tutorius/core.py index cf1d6b3..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") diff --git a/tutorius/creator.py b/tutorius/creator.py index 4f4cacc..0e2e836 100644 --- a/tutorius/creator.py +++ b/tutorius/creator.py @@ -30,11 +30,11 @@ import os from sugar.graphics import icon import copy -from sugar.tutorius import overlayer, gtkutils, actions, vault, properties, addon -from sugar.tutorius import filters -from sugar.tutorius.services import ObjectStore -from sugar.tutorius.core import Tutorial, FiniteStateMachine, State -from sugar.tutorius import viewer +from . import overlayer, gtkutils, actions, vault, properties, addon +from . import filters +from .services import ObjectStore +from .core import Tutorial, FiniteStateMachine, State +from . import viewer class Creator(object): """ diff --git a/tutorius/editor.py b/tutorius/editor.py index 42cc718..9d2effe 100644 --- a/tutorius/editor.py +++ b/tutorius/editor.py @@ -24,7 +24,7 @@ import gobject from gettext import gettext as _ -from sugar.tutorius.gtkutils import register_signals_numbered, get_children +from .gtkutils import register_signals_numbered, get_children class WidgetIdentifier(gtk.Window): """ diff --git a/tutorius/engine.py b/tutorius/engine.py index 9c1dae4..e77a018 100644 --- a/tutorius/engine.py +++ b/tutorius/engine.py @@ -1,10 +1,10 @@ import logging import dbus.mainloop.glib from jarabe.model import shell - -from sugar.tutorius.vault import Vault from sugar.bundle.activitybundle import ActivityBundle +from .vault import Vault + class Engine: """ Driver for the execution of tutorials diff --git a/tutorius/filters.py b/tutorius/filters.py index 44621d5..38cf86b 100644 --- a/tutorius/filters.py +++ b/tutorius/filters.py @@ -18,7 +18,7 @@ import logging logger = logging.getLogger("filters") -from sugar.tutorius import properties +from . import properties class EventFilter(properties.TPropContainer): diff --git a/tutorius/linear_creator.py b/tutorius/linear_creator.py index 78e94ce..f664c49 100644 --- a/tutorius/linear_creator.py +++ b/tutorius/linear_creator.py @@ -15,12 +15,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.tutorius.core import * -from sugar.tutorius.actions import * -from sugar.tutorius.filters import * - from copy import deepcopy +from .core import * +from .actions import * +from .filters import * + class LinearCreator(object): """ This class is used to create a FSM from a linear sequence of orders. The diff --git a/tutorius/properties.py b/tutorius/properties.py index b9e6267..b7d0301 100644 --- a/tutorius/properties.py +++ b/tutorius/properties.py @@ -19,12 +19,12 @@ TutoriusProperties have the same behaviour as python properties (assuming you also use the TPropContainer), with the added benefit of having builtin dialog prompts and constraint validation. """ +from copy import copy -from sugar.tutorius.constraints import Constraint, \ +from .constraints import Constraint, \ UpperLimitConstraint, LowerLimitConstraint, \ MaxSizeConstraint, MinSizeConstraint, \ ColorConstraint, FileConstraint, BooleanConstraint, EnumConstraint -from copy import copy class TPropContainer(object): """ diff --git a/tutorius/service.py b/tutorius/service.py index 21f0cf1..eb246a1 100644 --- a/tutorius/service.py +++ b/tutorius/service.py @@ -1,7 +1,7 @@ -from engine import Engine import dbus -from dbustools import remote_call +from .engine import Engine +from .dbustools import remote_call _DBUS_SERVICE = "org.tutorius.Service" _DBUS_PATH = "/org/tutorius/Service" diff --git a/tutorius/vault.py b/tutorius/vault.py index cc2a3f6..45f8184 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 -- cgit v0.9.1