# HG changeset patch
# User dclinton@b35c0ba3-1128-0410-9219-0b39014e361d
# Date 1241375851 0
# Node ID a58f4a7ad991fec8e823a10b8755de335e6585b9
# Parent  fc159c49c080d3b8156dfeb19962528cb27236e4
Support hashlib in addition to the older md5 library.

diff -r fc159c49c080d3b8156dfeb19962528cb27236e4 -r a58f4a7ad991fec8e823a10b8755de335e6585b9 CHANGES
--- a/CHANGES	Tue Mar 31 15:52:16 2009 +0000
+++ b/CHANGES	Sun May 03 18:37:31 2009 +0000
@@ -1,3 +1,7 @@
+2009-05-03
+
+ Support hashlib in addition to the older md5 library.
+
 2009-03-11
 
  Added page parameter to GetReplies, GetFriends, GetFollowers, and GetDirectMessages
diff -r fc159c49c080d3b8156dfeb19962528cb27236e4 -r a58f4a7ad991fec8e823a10b8755de335e6585b9 twitter.py
--- a/twitter.py	Tue Mar 31 15:52:16 2009 +0000
+++ b/twitter.py	Sun May 03 18:37:31 2009 +0000
@@ -22,7 +22,6 @@
 
 import base64
 import calendar
-import md5
 import os
 import rfc822
 import simplejson
@@ -34,6 +33,11 @@
 import urllib2
 import urlparse
 
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
+
 
 CHARACTER_LIMIT = 140
 
@@ -2113,7 +2117,11 @@
     self._root_directory = root_directory
 
   def _GetPath(self,key):
-    hashed_key = md5.new(key).hexdigest()
+    try:
+        hashed_key = md5(key).hexdigest()
+    except TypeError:
+        hashed_key = md5.new(key).hexdigest()
+        
     return os.path.join(self._root_directory,
                         self._GetPrefix(hashed_key),
                         hashed_key)