equal
deleted
inserted
replaced
49 m = hashlib.new(algorithm) |
49 m = hashlib.new(algorithm) |
50 except ValueError: |
50 except ValueError: |
51 return False |
51 return False |
52 |
52 |
53 while True: |
53 while True: |
54 block = file.read() |
54 try: |
|
55 block = file.read() |
|
56 except IOError, err: |
|
57 print str(err), |
|
58 break |
|
59 |
55 m.update(block) |
60 m.update(block) |
56 if block == '': |
61 if block == '': |
57 break |
62 break |
58 |
63 |
59 return "%s:%s" % (algorithm, m.hexdigest()) |
64 return "%s:%s" % (algorithm, m.hexdigest()) |
75 expr_bz = re.compile('.+\.bz2$', re.IGNORECASE) |
80 expr_bz = re.compile('.+\.bz2$', re.IGNORECASE) |
76 expr_gz = re.compile('.+\.gz$', re.IGNORECASE) |
81 expr_gz = re.compile('.+\.gz$', re.IGNORECASE) |
77 |
82 |
78 try: |
83 try: |
79 if expr_bz.match(filename): |
84 if expr_bz.match(filename): |
80 file = bz2.BZFile(filename, 'r') |
85 file = bz2.BZ2File(filename, 'r') |
81 elif expr_gz.match(filename): |
86 elif expr_gz.match(filename): |
82 file = gzip.GzipFile(filename, 'r') |
87 file = gzip.GzipFile(filename, 'r') |
83 else: |
88 else: |
84 return False |
89 return False |
85 except IOError as e: |
90 except IOError as e: |