Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-04-26 16:34:05 (GMT)
committer Dan Williams <dcbw@redhat.com>2007-04-26 16:34:05 (GMT)
commit274cc65c4e2eb781a26a1485c212fc311b2bbb63 (patch)
tree4f4daf4fa557a5f5fd1db5cb49faa3500a402937 /services
parent1c249a216bccdc13dac5678b92ca4dc1ee4b5a1b (diff)
Use hashlib on python 2.5
Diffstat (limited to 'services')
-rw-r--r--services/presence/server_plugin.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/services/presence/server_plugin.py b/services/presence/server_plugin.py
index c332337..ec49f32 100644
--- a/services/presence/server_plugin.py
+++ b/services/presence/server_plugin.py
@@ -23,7 +23,8 @@ import gtk
from buddyiconcache import BuddyIconCache
import logging
import os
-import md5
+
+import sys
import psutils
from telepathy.client import ConnectionManager, ManagerRegistry, Connection, Channel
@@ -343,7 +344,14 @@ class ServerPlugin(gobject.GObject):
if not icon_data:
icon_data = self._owner.props.icon
- m = md5.new()
+ m = None
+ if sys.version_info[:3] >= (2, 5, 0):
+ import hashlib
+ m = hashlib.md5()
+ else:
+ import md5
+ m = md5.new()
+
m.update(icon_data)
hash = m.hexdigest()