[conduit] Fix #583173

[John Carr <johncarr src gnome org>]

commit be139817cf1c6e27f9c5965e43f9a7c03fe8c020
Author: John Carr <john carr unrouted co uk>
Date:   Sat Jun 27 18:38:36 2009 +0100

    Fix #583173

 conduit/modules/FlickrModule/flickrapi/__init__.py |    5 ++++-
 .../GoogleModule/gdata/tlslite/utils/cryptomath.py |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/conduit/modules/FlickrModule/flickrapi/__init__.py b/conduit/modules/FlickrModule/flickrapi/__init__.py
index fbaddd1..50bf77e 100755
--- a/conduit/modules/FlickrModule/flickrapi/__init__.py
+++ b/conduit/modules/FlickrModule/flickrapi/__init__.py
@@ -42,7 +42,10 @@ __author__ = u'Sybren St\u00fcvel'.encode('utf-8')
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import sys
-import md5
+try:
+    from hashlib import md5
+except:
+    import md5
 import urllib
 import urllib2
 import mimetools
diff --git a/conduit/modules/GoogleModule/gdata/tlslite/utils/cryptomath.py b/conduit/modules/GoogleModule/gdata/tlslite/utils/cryptomath.py
index 51d6dff..1a2b505 100755
--- a/conduit/modules/GoogleModule/gdata/tlslite/utils/cryptomath.py
+++ b/conduit/modules/GoogleModule/gdata/tlslite/utils/cryptomath.py
@@ -6,7 +6,10 @@ import os
 import math
 import base64
 import binascii
-import sha
+try:
+    from hashlib import sha
+except:
+    import sha
 
 from compat import *