Rename imports from sugar to sugar3

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>

src/sugar3/presence/activity.py

@@ -39,12 +39,12 @@ from telepathy.constants import CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES, \
                                 HANDLE_TYPE_CONTACT, \
                                 PROPERTY_FLAG_WRITE
 
-from sugar.presence.buddy import Buddy
+from sugar3.presence.buddy import Buddy
 
 CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties'
 CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'
 
-_logger = logging.getLogger('sugar.presence.activity')
+_logger = logging.getLogger('sugar3.presence.activity')
 
 
 class Activity(gobject.GObject):

src/sugar3/presence/buddy.py

@@ -31,12 +31,12 @@ from telepathy.interfaces import CONNECTION, \
                                  CONNECTION_INTERFACE_CONTACTS
 from telepathy.constants import HANDLE_TYPE_CONTACT
 
-from sugar.presence.connectionmanager import get_connection_manager
+from sugar3.presence.connectionmanager import get_connection_manager
 
 ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
 CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'
 
-_logger = logging.getLogger('sugar.presence.buddy')
+_logger = logging.getLogger('sugar3.presence.buddy')
 
 
 class BaseBuddy(gobject.GObject):

src/sugar3/presence/connectionmanager.py

@@ -16,7 +16,7 @@
 # Boston, MA 02111-1307, USA.
 
 """
-UNSTABLE. It should really be internal to the sugar.presence package.
+UNSTABLE. It should really be internal to the sugar3.presence package.
 """
 
 from functools import partial

src/sugar3/presence/presenceservice.py

@@ -28,9 +28,9 @@ import dbus.exceptions
 import dbus.glib
 from dbus import PROPERTIES_IFACE
 
-from sugar.presence.buddy import Buddy, Owner
-from sugar.presence.activity import Activity
-from sugar.presence.connectionmanager import get_connection_manager
+from sugar3.presence.buddy import Buddy, Owner
+from sugar3.presence.activity import Activity
+from sugar3.presence.connectionmanager import get_connection_manager
 
 from telepathy.interfaces import ACCOUNT, \
                                  ACCOUNT_MANAGER, \
@@ -38,7 +38,7 @@ from telepathy.interfaces import ACCOUNT, \
 from telepathy.constants import HANDLE_TYPE_CONTACT
 
 
-_logger = logging.getLogger('sugar.presence.presenceservice')
+_logger = logging.getLogger('sugar3.presence.presenceservice')
 
 ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
 ACCOUNT_MANAGER_PATH = '/org/freedesktop/Telepathy/AccountManager'

src/sugar3/presence/sugartubeconn.py

@@ -22,8 +22,8 @@ STABLE.
 from telepathy.constants import (
     CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES)
 
-from sugar.presence.tubeconn import TubeConnection
-from sugar.presence import presenceservice
+from sugar3.presence.tubeconn import TubeConnection
+from sugar3.presence import presenceservice
 
 
 class SugarTubeConnection(TubeConnection):
@@ -42,7 +42,7 @@ class SugarTubeConnection(TubeConnection):
         """Retrieve a Buddy object given a telepathy handle.
 
         cs_handle: A channel-specific CONTACT type handle.
-        returns: sugar.presence Buddy object or None
+        returns: sugar3.presence Buddy object or None
         """
         pservice = presenceservice.get_instance()
         if self.self_handle == cs_handle: