to sugar3

11 files changed, 30 insertions, 29 deletions

diff --git a/.gitignore b/.gitignore
index 1e4c0c4..bbc801c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.pyo
 *.mo
 *~
+*.bak
diff --git a/activity.py b/activity.py
index d4f0e2a..30e9dc0 100644
--- a/activity.py
+++ b/activity.py
@@ -22,8 +22,8 @@
 #     along with Speak.activity.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from sugar.activity import activity
-from sugar.presence import presenceservice
+from sugar3.activity import activity
+from sugar3.presence import presenceservice
 import logging
 import gtk
 import gobject
@@ -31,15 +31,15 @@ import pango
 import cjson
 from gettext import gettext as _
 
-from sugar.graphics.toolbarbox import ToolbarButton
-from sugar.graphics.toggletoolbutton import ToggleToolButton
-from sugar.graphics.radiotoolbutton import RadioToolButton
+from sugar3.graphics.toolbarbox import ToolbarButton
+from sugar3.graphics.toggletoolbutton import ToggleToolButton
+from sugar3.graphics.radiotoolbutton import RadioToolButton
 
 from combobox import ComboBox
-from sugar.graphics.toolbarbox import ToolbarBox
+from sugar3.graphics.toolbarbox import ToolbarBox
 from shared_activity import SharedActivity
-from sugar.activity.widgets import ActivityToolbarButton
-from sugar.activity.widgets import StopButton
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.activity.widgets import StopButton
 
 from toolitem import ToolWidget
 import eye
diff --git a/aiml/PatternMgr.py b/aiml/PatternMgr.py
index 21b73f1..99f5124 100644
--- a/aiml/PatternMgr.py
+++ b/aiml/PatternMgr.py
@@ -124,7 +124,7 @@ class PatternMgr:
 
 		# add the template.
 		if not node.has_key(self._TEMPLATE):
-			self._templateCount += 1	
+			self._templateCount += 1
 		node[self._TEMPLATE] = template
 
 	def match(self, pattern, that, topic):
@@ -250,7 +250,7 @@ class PatternMgr:
 		at the root and leading to the matching pattern, and tem is the
 		matched template.
 
-		""" 
+		"""
 		# base-case: if the word list is empty, return the current node's
 		# template.
 		if len(words) == 0:
diff --git a/chat.py b/chat.py
index a61822d..c917498 100644
--- a/chat.py
+++ b/chat.py
@@ -19,9 +19,9 @@ import pango
 import logging
 from gettext import gettext as _
 
-import sugar.graphics.style as style
+import sugar3.graphics.style as style
 from roundbox import RoundBox
-from sugar.graphics.toggletoolbutton import ToggleToolButton
+from sugar3.graphics.toggletoolbutton import ToggleToolButton
 
 import eye
 import glasses
diff --git a/chatbox.py b/chatbox.py
index fdbff56..c762a34 100644
--- a/chatbox.py
+++ b/chatbox.py
@@ -23,13 +23,13 @@ import re
 from datetime import datetime
 from gettext import gettext as _
 
-from sugar.graphics import style
-from sugar.graphics.palette import Palette
-from sugar.graphics.palette import CanvasInvoker
-from sugar.graphics.palette import MouseSpeedDetector
-from sugar.presence import presenceservice
-from sugar.graphics.menuitem import MenuItem
-from sugar.activity.activity import get_activity_root
+from sugar3.graphics import style
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.palette import CanvasInvoker
+from sugar3.graphics.palette import MouseSpeedDetector
+from sugar3.presence import presenceservice
+from sugar3.graphics.menuitem import MenuItem
+from sugar3.activity.activity import get_activity_root
 from roundbox import RoundBox
 
 logger = logging.getLogger('speak')
@@ -351,9 +351,9 @@ class ChatBox(gtk.ScrolledWindow):
         """Ask the journal to display a URL"""
         import os
         import time
-        from sugar import profile
-        from sugar.activity.activity import show_object_in_journal
-        from sugar.datastore import datastore
+        from sugar3 import profile
+        from sugar3.activity.activity import show_object_in_journal
+        from sugar3.datastore import datastore
         logger.debug('Create journal entry for URL: %s', url)
         jobject = datastore.create()
         metadata = {
diff --git a/face.py b/face.py
index b7e3372..7609923 100644
--- a/face.py
+++ b/face.py
@@ -26,7 +26,7 @@ import logging
 import gtk
 import cjson
 
-import sugar.graphics.style as style
+import sugar3.graphics.style as style
 
 import espeak
 import eye
diff --git a/messenger.py b/messenger.py
index eb03bda..a389157 100644
--- a/messenger.py
+++ b/messenger.py
@@ -18,7 +18,7 @@ import logging
 from dbus.gobject_service import ExportedGObject
 from dbus.service import method, signal
 
-from sugar.presence import presenceservice
+from sugar3.presence import presenceservice
 
 import face
 
diff --git a/roundbox.py b/roundbox.py
index 35d5f7c..26e3c84 100644
--- a/roundbox.py
+++ b/roundbox.py
@@ -1,6 +1,6 @@
 import math
 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 745c6ec..5cae440 100755
--- a/setup.py
+++ b/setup.py
@@ -23,5 +23,5 @@
 #     You should have received a copy of the GNU General Public License
 #     along with Speak.activity.  If not, see <http://www.gnu.org/licenses/>.
 
-from sugar.activity import bundlebuilder
+from sugar3.activity import bundlebuilder
 bundlebuilder.start()
diff --git a/shared_activity.py b/shared_activity.py
index a537958..8161291 100644
--- a/shared_activity.py
+++ b/shared_activity.py
@@ -19,8 +19,8 @@
 import logging
 import telepathy
 
-from sugar.activity import activity
-from sugar.presence.sugartubeconn import SugarTubeConnection
+from sugar3.activity import activity
+from sugar3.presence.sugartubeconn import SugarTubeConnection
 
 
 class SharedActivity(activity.Activity):
diff --git a/toolitem.py b/toolitem.py
index 1f4ee49..ba5008b 100644
--- a/toolitem.py
+++ b/toolitem.py
@@ -20,7 +20,7 @@
 import gtk
 import gobject
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 
 class ToolWidget(gtk.ToolItem):