SF.net SVN: matplotlib:[6293] trunk/toolkits/basemap/lib/httplib2/__init__. py

[<js...@us...>]

Revision: 6293
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6293&view=rev
Author:   jswhit
Date:     2008-10-22 13:27:22 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
python 2.6 tweaks

Modified Paths:
--------------
    trunk/toolkits/basemap/lib/httplib2/__init__.py

Modified: trunk/toolkits/basemap/lib/httplib2/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/httplib2/__init__.py	2008-10-22 02:18:59 UTC (rev 6292)
+++ trunk/toolkits/basemap/lib/httplib2/__init__.py	2008-10-22 13:27:22 UTC (rev 6293)
@@ -26,7 +26,10 @@
 
 import re 
 import sys 
-import md5
+try:
+    from hashlib import md5
+except ImportError:
+    import md5
 import email
 import email.Utils
 import email.Message
@@ -41,7 +44,10 @@
 import calendar
 import time
 import random
-import sha
+try:
+    from hashlib import sha1 as sha
+except ImportError:
+    import sha
 import hmac
 from gettext import gettext as _
 import socket


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.