diff options
author | Simon Schampijer <simon@schampijer.de> | 2011-10-29 13:55:20 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2011-10-29 13:55:20 (GMT) |
commit | 39922aaf56a1a08cca3524834b3b32fa2051be13 (patch) | |
tree | 153b939a73e109d85b09eac1f75a561974fa3b5b | |
parent | 54af0f766b31681aee887dba37d146f34ce0ab03 (diff) |
Fixing more imports
-rw-r--r-- | src/sugar3/activity/activity.py | 4 | ||||
-rw-r--r-- | src/sugar3/activity/activityfactory.py | 4 | ||||
-rw-r--r-- | src/sugar3/activity/bundlebuilder.py | 2 | ||||
-rw-r--r-- | src/sugar3/bundle/activitybundle.py | 4 | ||||
-rw-r--r-- | src/sugar3/bundle/contentbundle.py | 2 | ||||
-rw-r--r-- | src/sugar3/datastore/datastore.py | 6 | ||||
-rw-r--r-- | src/sugar3/profile.py | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/sugar3/activity/activity.py b/src/sugar3/activity/activity.py index da6361a..f5ca778 100644 --- a/src/sugar3/activity/activity.py +++ b/src/sugar3/activity/activity.py @@ -71,7 +71,7 @@ from telepathy.interfaces import CHANNEL, \ from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT from telepathy.constants import CONNECTION_HANDLE_TYPE_ROOM -from sugar import util +from sugar3 import util from sugar3.presence import presenceservice from sugar3.activity import i18n from sugar3.activity.activityservice import ActivityService @@ -82,7 +82,7 @@ from sugar3.graphics.alert import Alert from sugar3.graphics.icon import Icon from sugar3.datastore import datastore from sugar3.session import XSMPClient -from sugar import wm +from sugar3 import wm # support deprecated imports from sugar3.activity.widgets import ActivityToolbar, EditToolbar diff --git a/src/sugar3/activity/activityfactory.py b/src/sugar3/activity/activityfactory.py index 3f3ffef..d544cd0 100644 --- a/src/sugar3/activity/activityfactory.py +++ b/src/sugar3/activity/activityfactory.py @@ -29,8 +29,8 @@ import dbus from gi.repository import GObject from sugar3.activity.activityhandle import ActivityHandle -from sugar import util -from sugar import env +from sugar3 import util +from sugar3 import env from sugar3.datastore import datastore from errno import EEXIST, ENOSPC diff --git a/src/sugar3/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py index 08e5821..3d1d5fc 100644 --- a/src/sugar3/activity/bundlebuilder.py +++ b/src/sugar3/activity/bundlebuilder.py @@ -32,7 +32,7 @@ from optparse import OptionParser import logging from fnmatch import fnmatch -from sugar import env +from sugar3 import env from sugar3.bundle.activitybundle import ActivityBundle diff --git a/src/sugar3/bundle/activitybundle.py b/src/sugar3/bundle/activitybundle.py index 8285c6c..206c4fb 100644 --- a/src/sugar3/bundle/activitybundle.py +++ b/src/sugar3/bundle/activitybundle.py @@ -28,8 +28,8 @@ import tempfile import logging import warnings -from sugar import env -from sugar import util +from sugar3 import env +from sugar3 import util from sugar3.bundle.bundle import Bundle, \ MalformedBundleException, NotInstalledException from sugar3.bundle.bundleversion import NormalizedVersion diff --git a/src/sugar3/bundle/contentbundle.py b/src/sugar3/bundle/contentbundle.py index 6ee74b5..38b4dc5 100644 --- a/src/sugar3/bundle/contentbundle.py +++ b/src/sugar3/bundle/contentbundle.py @@ -25,7 +25,7 @@ from ConfigParser import ConfigParser import os import urllib -from sugar import env +from sugar3 import env from sugar3.bundle.bundle import Bundle, NotInstalledException, \ MalformedBundleException diff --git a/src/sugar3/datastore/datastore.py b/src/sugar3/datastore/datastore.py index 03d9418..2ada474 100644 --- a/src/sugar3/datastore/datastore.py +++ b/src/sugar3/datastore/datastore.py @@ -31,9 +31,9 @@ from gi.repository import Gio import dbus import dbus.glib -from sugar import env -from sugar import mime -from sugar import dispatch +from sugar3 import env +from sugar3 import mime +from sugar3 import dispatch DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore' DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore' diff --git a/src/sugar3/profile.py b/src/sugar3/profile.py index c28923a..7482da6 100644 --- a/src/sugar3/profile.py +++ b/src/sugar3/profile.py @@ -25,8 +25,8 @@ import os import logging from ConfigParser import ConfigParser -from sugar import env -from sugar import util +from sugar3 import env +from sugar3 import util from sugar3.graphics.xocolor import XoColor |