From 89ef6304a199b23ac62dd3aa813947606a1afa99 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Sat, 29 Oct 2011 15:55:20 +0200
Subject: [PATCH] Fix broken imports

8f1a821d683193a1849ec9658b0a52408dfae304 only changed imports starting with
"import", but not those using "from ... import ...".

[replaced description]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
---
 src/sugar3/activity/activity.py        | 4 ++--
 src/sugar3/activity/activityfactory.py | 4 ++--
 src/sugar3/activity/bundlebuilder.py   | 2 +-
 src/sugar3/bundle/activitybundle.py    | 4 ++--
 src/sugar3/bundle/contentbundle.py     | 2 +-
 src/sugar3/datastore/datastore.py      | 6 +++---
 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 b7f054d0..c788706b 100644
--- a/src/sugar3/activity/activity.py
+++ b/src/sugar3/activity/activity.py
@@ -70,7 +70,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.activityservice import ActivityService
 from sugar3.activity.namingalert import NamingAlert
@@ -80,7 +80,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 9e861d1e..3b636623 100644
--- a/src/sugar3/activity/activityfactory.py
+++ b/src/sugar3/activity/activityfactory.py
@@ -29,8 +29,8 @@ import dbus
 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 08e58212..3d1d5fc9 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 8285c6c2..206c4fb8 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 6ee74b58..38b4dc56 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 ed056347..ed6c2d7e 100644
--- a/src/sugar3/datastore/datastore.py
+++ b/src/sugar3/datastore/datastore.py
@@ -31,9 +31,9 @@ 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 f1708048..172d2adb 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