| Revisão | 1a2a3400040efce409a20d34fb0802cce1054dd4 (tree) |
|---|---|
| Hora | 2012-02-23 11:57:11 |
| Autor | Taizo ITO <taizo.ito@hde....> |
| Commiter | Taizo ITO |
DeprecationWarning: the sha module is deprecated; use the hashlib module instead
karesansui/gadget/guest.py (diff) karesansui/lib/crypt.py (diff) karesansui/lib/log/viewer.py (diff)| @@ -219,7 +219,8 @@ def validates_guest_add(obj): | ||
| 219 | 219 | ) and check |
| 220 | 220 | if check: |
| 221 | 221 | check = is_iso9660_filesystem_format(obj.input.vm_iso) |
| 222 | - checker.add_error(_('"%s" is not valid ISO 9660 CD-ROM filesystem data.') % obj.input.vm_iso) | |
| 222 | + if not check: | |
| 223 | + checker.add_error(_('"%s" is not valid ISO 9660 CD-ROM filesystem data.') % obj.input.vm_iso) | |
| 223 | 224 | |
| 224 | 225 | if not is_param(obj.input, 'keymap'): |
| 225 | 226 | check = False |
| @@ -11,7 +11,11 @@ | ||
| 11 | 11 | # |
| 12 | 12 | |
| 13 | 13 | import random |
| 14 | -import sha | |
| 14 | +try: | |
| 15 | + from hashlib import sha1 as sha | |
| 16 | +except: | |
| 17 | + import sha | |
| 18 | + from sha import sha | |
| 15 | 19 | |
| 16 | 20 | def sha1encrypt(v): |
| 17 | 21 | """<comment-ja> |
| @@ -29,7 +33,7 @@ def sha1encrypt(v): | ||
| 29 | 33 | for x in xrange(0,16): |
| 30 | 34 | salt += random.choice('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') |
| 31 | 35 | |
| 32 | - r = sha.sha(v+salt).hexdigest() | |
| 36 | + r = sha(v+salt).hexdigest() | |
| 33 | 37 | return r, salt |
| 34 | 38 | |
| 35 | 39 | def sha1compare(target, plain, salt=''): |
| @@ -48,7 +52,7 @@ def sha1compare(target, plain, salt=''): | ||
| 48 | 52 | TODO: English Comment |
| 49 | 53 | </comment-en> |
| 50 | 54 | """ |
| 51 | - x = sha.sha(plain+salt).hexdigest() | |
| 55 | + x = sha(plain+salt).hexdigest() | |
| 52 | 56 | if target == x: |
| 53 | 57 | return True |
| 54 | 58 | else: |
| @@ -17,8 +17,12 @@ import re | ||
| 17 | 17 | import time |
| 18 | 18 | import os |
| 19 | 19 | import os.path |
| 20 | -import sha | |
| 21 | 20 | import gzip |
| 21 | +try: | |
| 22 | + from hashlib import sha1 as sha | |
| 23 | +except: | |
| 24 | + import sha | |
| 25 | + from sha import sha | |
| 22 | 26 | |
| 23 | 27 | def read_all_log(app_log_config, max_line, start_datetime="", end_datetime="", keyword=""): |
| 24 | 28 | lines = [] |
| @@ -33,7 +37,7 @@ def read_all_log(app_log_config, max_line, start_datetime="", end_datetime="", k | ||
| 33 | 37 | if lines is False: |
| 34 | 38 | return False |
| 35 | 39 | for line in lines: |
| 36 | - key = sha.new(line).hexdigest() | |
| 40 | + key = sha(line).hexdigest() | |
| 37 | 41 | logs.update({key: line}) |
| 38 | 42 | pattern = re.compile(log["time_pattern"]) |
| 39 | 43 | time_format = log["time_format"] |
Karesansui
Fork