Fix broken imports

8f1a821d68 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

@@ -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

src/sugar3/activity/activityfactory.py

@@ -29,8 +29,8 @@ import dbus
 import gobject
 
 from sugar3.activity.activityhandle import ActivityHandle
-from sugar import util
+from sugar3 import util
-from sugar import env
+from sugar3 import env
 from sugar3.datastore import datastore
 
 from errno import EEXIST, ENOSPC

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
 
 

src/sugar3/bundle/activitybundle.py

@@ -28,8 +28,8 @@ import tempfile
 import logging
 import warnings
 
-from sugar import env
+from sugar3 import env
-from sugar import util
+from sugar3 import util
 from sugar3.bundle.bundle import Bundle, \
     MalformedBundleException, NotInstalledException
 from sugar3.bundle.bundleversion import NormalizedVersion

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
 

src/sugar3/datastore/datastore.py

@@ -31,9 +31,9 @@ import gio
 import dbus
 import dbus.glib
 
-from sugar import env
+from sugar3 import env
-from sugar import mime
+from sugar3 import mime
-from sugar import dispatch
+from sugar3 import dispatch
 
 DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
 DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore'

src/sugar3/profile.py

@@ -25,8 +25,8 @@ import os
 import logging
 from ConfigParser import ConfigParser
 
-from sugar import env
+from sugar3 import env
-from sugar import util
+from sugar3 import util
 from sugar3.graphics.xocolor import XoColor