← Back to branch summary

~osomon/moovida/upicek_release_scripts

« back to all changes in this revision

Viewing changes to elisa-plugins/elisa/plugins/flickr/tests/test_flickr_api.py

  • Committer: Olivier Tilloy
  • Date: 2008-10-06 11:21:47 UTC
  • mfrom: (771.1.2 upicek_hashlib)
  • Revision ID: olivier@fluendo.com-20081006112147-key4lrmtc0f95hd0
https://launchpad.net/bugs/251849
 Fallback to md5 when hashlib is not available (python < 2.5).

Show diffs side-by-side

added added

removed removed

Lines of Context:
elisa-plugins/elisa/plugins/flickr/tests/test_flickr_api.py
29
29
 
30
30
from elisa.core.media_uri import MediaUri
31
31
 
32
 
import hashlib
 
32
try:
 
33
    from hashlib import md5
 
34
except ImportError:
 
35
    # hashlib is new in Python 2.5
 
36
    from md5 import md5
 
37
 
33
38
from xml.dom import minidom
34
39
import os.path
35
40
import shutil
64
69
                     'api_key': flickr._key}
65
70
        flickr.sign_arguments(arguments)
66
71
        self.failUnless('api_sig' in arguments.keys())
67
 
        md5 = hashlib.md5(flickr._secret + 'api_key' + flickr._key + \
68
 
                          'methodflickr.auth.getFrob').hexdigest()
 
72
        md5 = md5(flickr._secret + 'api_key' + flickr._key + \
 
73
                  'methodflickr.auth.getFrob').hexdigest()
69
74
        self.failUnlessEqual(arguments['api_sig'], md5)
70
75
 
71
76
    def test_save_token(self):