equal
deleted
inserted
replaced
23 def md5(s): |
23 def md5(s): |
24 try: |
24 try: |
25 import hashlib |
25 import hashlib |
26 _md5 = hashlib.md5 |
26 _md5 = hashlib.md5 |
27 except ImportError: |
27 except ImportError: |
28 import md5 |
28 from md5 import md5 as _md5 |
29 _md5 = md5.md5 |
|
30 global md5 |
29 global md5 |
31 md5 = _md5 |
30 md5 = _md5 |
32 return _md5(s) |
31 return _md5(s) |
33 |
32 |
34 def sha1(s): |
33 def sha1(s): |
35 try: |
34 try: |
36 import hashlib |
35 import hashlib |
37 _sha1 = hashlib.sha1 |
36 _sha1 = hashlib.sha1 |
38 except ImportError: |
37 except ImportError: |
39 import sha |
38 from sha import sha as _sha1 |
40 _sha1 = sha.sha |
|
41 global sha1 |
39 global sha1 |
42 sha1 = _sha1 |
40 sha1 = _sha1 |
43 return _sha1(s) |
41 return _sha1(s) |
44 |
42 |
45 import subprocess |
43 import subprocess |