Remove some unused imports

src/sugar/activity/activity.py

@@ -62,15 +62,13 @@ import dbus.service
 from dbus import PROPERTIES_IFACE
 import cjson
 from telepathy.server import DBusProperties
-from telepathy.interfaces import CONNECTION, \
+from telepathy.interfaces import CHANNEL, \
-                                 CHANNEL, \
                                  CHANNEL_TYPE_TEXT, \
                                  CLIENT, \
                                  CLIENT_HANDLER
 from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT
 
 from sugar import util
-from sugar import dispatch
 from sugar.presence import presenceservice
 from sugar.activity.activityservice import ActivityService
 from sugar.activity.namingalert import NamingAlert

src/sugar/activity/activityfactory.py

@@ -27,7 +27,6 @@ import uuid
 import dbus
 import gobject
 
-from sugar.presence import presenceservice
 from sugar.activity.activityhandle import ActivityHandle
 from sugar import util
 from sugar import env

src/sugar/presence/activity.py

@@ -26,7 +26,6 @@ from functools import partial
 import dbus
 from dbus import PROPERTIES_IFACE
 import gobject
-import telepathy
 from telepathy.client import Channel
 from telepathy.interfaces import CHANNEL, \
                                  CHANNEL_INTERFACE_GROUP, \

src/sugar/presence/buddy.py

@@ -21,14 +21,12 @@ STABLE.
 """
 
 import logging
-from functools import partial
 
 import gobject
 import gtk
 import dbus
 import gconf
-from telepathy.interfaces import ACCOUNT, \
+from telepathy.interfaces import CONNECTION, \
-                                 CONNECTION, \
                                  CONNECTION_INTERFACE_ALIASING, \
                                  CONNECTION_INTERFACE_CONTACTS
 from telepathy.constants import HANDLE_TYPE_CONTACT

src/sugar/presence/presenceservice.py

@@ -22,7 +22,6 @@ STABLE.
 """
 
 import logging
-import traceback
 
 import gobject
 import dbus
@@ -37,8 +36,7 @@ from sugar.presence.util import get_connection_manager
 from telepathy.interfaces import ACCOUNT, \
                                  ACCOUNT_MANAGER, \
                                  CONNECTION
-from telepathy.constants import HANDLE_TYPE_CONTACT, \
+from telepathy.constants import HANDLE_TYPE_CONTACT
-                                HANDLE_TYPE_ROOM
 
 _logger = logging.getLogger('sugar.presence.presenceservice')
 

src/sugar/presence/util.py

@@ -15,7 +15,6 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-import logging
 from functools import partial
 
 import dbus