diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-24 10:16:37 (GMT) |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-24 17:56:12 (GMT) |
commit | cb279a14187a6ca85d62db46455959a2f41bbfab (patch) | |
tree | e8e97ba5f4de3f9169c8ac803be9225692bce144 /services | |
parent | 417fd7cc8a14188a62cdaef78bc84d9f87b6515b (diff) |
services/presence/server_plugin: reorder imports
Diffstat (limited to 'services')
-rw-r--r-- | services/presence/server_plugin.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/services/presence/server_plugin.py b/services/presence/server_plugin.py index 486bec4..cfa1819 100644 --- a/services/presence/server_plugin.py +++ b/services/presence/server_plugin.py @@ -16,23 +16,20 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import gobject -import dbus -from sugar import util -import gtk -from buddyiconcache import BuddyIconCache +# Standard library import logging import os - +import sys try: # Python >= 2.5 from hashlib import md5 except ImportError: from md5 import new as md5 -import sys -import psutils - +# Other libraries +import dbus +import gobject +import gtk from telepathy.client import (ConnectionManager, ManagerRegistry, Connection, Channel) 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_REASON_AUTHENTICATION_FAILED, 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_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties' |