Convert the sugar imports to sugar3

14 files changed, 37 insertions, 37 deletions

diff --git a/activity.py b/activity.py
index fceef10..c66125e 100644
--- a/activity.py
+++ b/activity.py
@@ -37,15 +37,15 @@ GObject.threads_init()
 import telepathy
 import telepathy.client
 
-from sugar.activity.widgets import ActivityToolbarButton
-from sugar.activity.widgets import StopButton
-from sugar.graphics.toolbarbox import ToolbarBox
-from sugar.graphics.toggletoolbutton import ToggleToolButton
-from sugar.activity.activity import Activity
-from sugar.presence import presenceservice
-from sugar.presence.tubeconn import TubeConnection
-
-from sugar import profile
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.activity.widgets import StopButton
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.graphics.toggletoolbutton import ToggleToolButton
+from sugar3.activity.activity import Activity
+from sugar3.presence import presenceservice
+from sugar3.presence.tubeconn import TubeConnection
+
+from sugar3 import profile
 import cardtable
 import scoreboard
 import game
diff --git a/cardlist.py b/cardlist.py
index 4f22c46..2e8f383 100644
--- a/cardlist.py
+++ b/cardlist.py
@@ -26,8 +26,8 @@ import shutil
 
 from model import Pair
 
-from sugar.graphics import style
-from sugar.graphics.icon import Icon
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon
 
 import theme
 
diff --git a/createcardpanel.py b/createcardpanel.py
index e75ae83..0bb3c91 100644
--- a/createcardpanel.py
+++ b/createcardpanel.py
@@ -28,12 +28,12 @@ from gettext import gettext as _
 import svgcard
 import logging
 
-from sugar.graphics import style
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.icon import Icon
-from sugar.graphics.palette import Palette
-from sugar.graphics.toggletoolbutton import ToggleToolButton
-from sugar.graphics.toolcombobox import ToolComboBox
+from sugar3.graphics import style
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.toggletoolbutton import ToggleToolButton
+from sugar3.graphics.toolcombobox import ToolComboBox
 from fontcombobox import FontComboBox
 from port import chooser
 
diff --git a/createtoolbar.py b/createtoolbar.py
index b372cee..86ca582 100644
--- a/createtoolbar.py
+++ b/createtoolbar.py
@@ -22,10 +22,10 @@ from gi.repository import GObject
 
 import logging
 
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.toggletoolbutton import ToggleToolButton
-from sugar.graphics.alert import Alert
-from sugar.graphics.icon import Icon
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.toggletoolbutton import ToggleToolButton
+from sugar3.graphics.alert import Alert
+from sugar3.graphics.icon import Icon
 
 
 class CreateToolbarBuilder(GObject.GObject):
diff --git a/face.py b/face.py
index 052c9da..703a126 100644
--- a/face.py
+++ b/face.py
@@ -18,7 +18,7 @@ from gi.repository import Gdk
 import logging
 _logger = logging.getLogger('memorize-activity')
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 import speak.espeak
 import speak.face
diff --git a/memorizetoolbar.py b/memorizetoolbar.py
index 5b1b03e..f83fedf 100644
--- a/memorizetoolbar.py
+++ b/memorizetoolbar.py
@@ -19,12 +19,12 @@ from gi.repository import GObject
 from os.path import join, dirname
 
 from gettext import gettext as _
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.toolcombobox import ToolComboBox
-from sugar.graphics.alert import Alert
-from sugar.graphics.icon import Icon
-from sugar.activity.widgets import RadioMenuButton
-from sugar.graphics.menuitem import MenuItem
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.toolcombobox import ToolComboBox
+from sugar3.graphics.alert import Alert
+from sugar3.graphics.icon import Icon
+from sugar3.activity.widgets import RadioMenuButton
+from sugar3.graphics.menuitem import MenuItem
 
 import logging
 from gobject import SIGNAL_RUN_FIRST, TYPE_PYOBJECT
diff --git a/messenger.py b/messenger.py
index 3cbd7e7..1a33d9e 100644
--- a/messenger.py
+++ b/messenger.py
@@ -23,7 +23,7 @@ from os import environ, chmod
 from os.path import join, getsize, dirname, basename
 from dbus.service import method, signal
 from dbus.gobject_service import ExportedGObject
-from sugar.datastore import datastore
+from sugar3.datastore import datastore
 from gettext import gettext as _
 
 SERVICE = 'org.laptop.Memorize'
diff --git a/model.py b/model.py
index 80e0582..b8afacd 100644
--- a/model.py
+++ b/model.py
@@ -24,7 +24,7 @@ from gi.repository import GObject
 import zipfile
 import tempfile
 
-from sugar.activity.activity import get_bundle_path, get_activity_root
+from sugar3.activity.activity import get_bundle_path, get_activity_root
 
 _logger = logging.getLogger('model')
 
diff --git a/port/chooser.py b/port/chooser.py
index f813174..c03037c 100644
--- a/port/chooser.py
+++ b/port/chooser.py
@@ -17,8 +17,8 @@
 from gi.repository import Gtk
 import logging
 
-from sugar import mime
-from sugar.graphics.objectchooser import ObjectChooser
+from sugar3 import mime
+from sugar3.graphics.objectchooser import ObjectChooser
 
 TEXT  = hasattr(mime, 'GENERIC_TYPE_TEXT') and mime.GENERIC_TYPE_TEXT or None
 IMAGE = hasattr(mime, 'GENERIC_TYPE_IMAGE') and mime.GENERIC_TYPE_IMAGE or None
diff --git a/port/roundbox.py b/port/roundbox.py
index 02cc1a3..8f5a184 100644
--- a/port/roundbox.py
+++ b/port/roundbox.py
@@ -2,7 +2,7 @@ import math
 
 from gi.repository import Gtk
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 
 class RoundBox(Gtk.HBox):
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/speak/face.py b/speak/face.py
index c78677e..47091ec 100644
--- a/speak/face.py
+++ b/speak/face.py
@@ -29,7 +29,7 @@ from gettext import gettext as _
 
 from gi.repository import Gtk
 
-import sugar.graphics.style as style
+import sugar3.graphics.style as style
 
 import espeak
 import eye
diff --git a/speak/widgets.py b/speak/widgets.py
index e3fffde..6005b8c 100644
--- a/speak/widgets.py
+++ b/speak/widgets.py
@@ -14,7 +14,7 @@
 
 import logging
 
-from sugar.graphics.combobox import ComboBox
+from sugar3.graphics.combobox import ComboBox
 
 import voice
 
diff --git a/svgcard.py b/svgcard.py
index 0fb2a37..06f5244 100644
--- a/svgcard.py
+++ b/svgcard.py
@@ -27,7 +27,7 @@ from gi.repository import Gdk
 from gi.repository import GdkPixbuf
 from gi.repository import Pango
 
-from sugar.util import LRU
+from sugar3.util import LRU
 
 import theme
 import face