services/presence/server_plugin: reorder imports

This commit is contained in:
Simon McVittie 2007-05-24 11:16:37 +01:00
parent 417fd7cc8a
commit cb279a1418

View File

@ -16,23 +16,20 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import gobject # Standard library
import dbus
from sugar import util
import gtk
from buddyiconcache import BuddyIconCache
import logging import logging
import os import os
import sys
try: try:
# Python >= 2.5 # Python >= 2.5
from hashlib import md5 from hashlib import md5
except ImportError: except ImportError:
from md5 import new as md5 from md5 import new as md5
import sys # Other libraries
import psutils import dbus
import gobject
import gtk
from telepathy.client import (ConnectionManager, ManagerRegistry, Connection, from telepathy.client import (ConnectionManager, ManagerRegistry, Connection,
Channel) Channel)
from telepathy.interfaces import (CONN_MGR_INTERFACE, CONN_INTERFACE, from telepathy.interfaces import (CONN_MGR_INTERFACE, CONN_INTERFACE,
@ -45,6 +42,12 @@ from telepathy.constants import (HANDLE_TYPE_CONTACT,
CONNECTION_STATUS_CONNECTING, CONNECTION_STATUS_CONNECTING,
CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED, CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED,
PROPERTY_FLAG_WRITE) PROPERTY_FLAG_WRITE)
from sugar import util
# Presence Service local modules
from buddyiconcache import BuddyIconCache
import psutils
CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo' CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'
CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties' CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties'