Signed-off-by: Manuel Quiñones
---
browser.py |8
downloadmanager.py | 14 +++---
edittoolbar.py |8
filepicker.py |4 ++--
linkbutton.py |6 +++---
palettes.py| 10 +-
places.py |2 +-
setup.py |2 +-
viewtoolbar.py |2 +-
webactivity.py | 20 ++--
webtoolbar.py | 12 ++--
widgets.py |2 +-
12 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/browser.py b/browser.py
index f2c4cc5..ce30067 100644
--- a/browser.py
+++ b/browser.py
@@ -30,10 +30,10 @@ from xpcom import components
from xpcom.components import interfaces
from hulahop.webview import WebView
-from sugar import env
-from sugar.activity import activity
-from sugar.graphics import style
-from sugar.graphics.icon import Icon
+from sugar3 import env
+from sugar3.activity import activity
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon
import sessionstore
from palettes import ContentInvoker
diff --git a/downloadmanager.py b/downloadmanager.py
index 0a8d2b2..af22df4 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -29,13 +29,13 @@ from xpcom import components
from xpcom.components import interfaces
from xpcom.server.factory import Factory
-from sugar.datastore import datastore
-from sugar import profile
-from sugar import mime
-from sugar.graphics.alert import Alert, TimeoutAlert
-from sugar.graphics.icon import Icon
-from sugar.graphics import style
-from sugar.activity import activity
+from sugar3.datastore import datastore
+from sugar3 import profile
+from sugar3 import mime
+from sugar3.graphics.alert import Alert, TimeoutAlert
+from sugar3.graphics.icon import Icon
+from sugar3.graphics import style
+from sugar3.activity import activity
# #3903 - this constant can be removed and assumed to be 1 when dbus-python
# 0.82.3 is the only version used
import dbus
diff --git a/edittoolbar.py b/edittoolbar.py
index d5f0286..7273382 100644
--- a/edittoolbar.py
+++ b/edittoolbar.py
@@ -20,10 +20,10 @@ from gettext import gettext as _
from xpcom.components import interfaces
-from sugar.activity import activity
-from sugar.graphics import iconentry
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics import style
+from sugar3.activity import activity
+from sugar3.graphics import iconentry
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics import style
class EditToolbar(activity.EditToolbar):
diff --git a/filepicker.py b/filepicker.py
index a06e879..489570a 100644
--- a/filepicker.py
+++ b/filepicker.py
@@ -27,8 +27,8 @@ from xpcom import components
from xpcom.components import interfaces
from xpcom.server.factory import Factory
-from sugar.graphics.objectchooser import ObjectChooser
-from sugar.activity.activity import get_activity_root
+from sugar3.graphics.objectchooser import ObjectChooser
+from sugar3.activity.activity import get_activity_root
_temp_dirs_to_clean = []
diff --git a/linkbutton.py b/linkbutton.py
index 49f6451..b43374c 100644
--- a/linkbutton.py
+++ b/linkbutton.py
@@ -23,9 +23,9 @@ import rsvg
import re
import gc
-from sugar.graphics.palette import Palette
-from sugar.graphics.tray import TrayButton
-from sugar.graphics import style
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.tray import TrayButton
+from sugar3.graphics import style
class LinkButton(TrayButton, GObject.GObject):
diff --git a/palettes.py b/palettes.py
index 5c8f242..38f6823 100644
--- a/palettes.py
+++ b/palettes.py
@@ -26,11 +26,11 @@ import xpcom
from xpcom import components
from xpcom.components import interfaces
-from sugar.graphics.palette import Palette, Invoker
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.icon import Icon
-from sugar import profile
-from sugar.activity import activity
+from sugar3.graphics.palette import Palette, Invoker
+from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.icon import Icon
+from sugar3 import profile
+from sugar3.activity import activity
import downloadmanager
diff --git a/places.py b/places.py
index d44d747..90956fe 100644
--- a/places.py
+++ b/places.py
@@ -18,7 +18,7 @@ import os
import sqlite3
from datetime import datetime, timedelta
-from sugar.activity import activity
+from sugar3.activity import activity
_store = None
diff --git a/setup.py b/setup.py
index 530f97c..c60f4d0 100755
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,6 @@
# 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.activity import bundlebuilder
+from sugar3.activity import bundlebuilder
bundlebuilder.start()
diff --git a/viewtoolbar.py b/viewtoolbar.py
index 7f74035..0e77137 100644
--- a/viewtoolbar.py
+++ b/viewtoolbar.py
@@ -19,7 +19,7 @@ from gettext import gettext as _
from gi.repo
