comparison tests/md5sum.py @ 25660:328739ea70c3

global: mass rewrite to use modern exception syntax Python 2.6 introduced the "except type as instance" syntax, replacing the "except type, instance" syntax that came before. Python 3 dropped support for the latter syntax. Since we no longer support Python 2.4 or 2.5, we have no need to continue supporting the "except type, instance". This patch mass rewrites the exception syntax to be Python 2.6+ and Python 3 compatible. This patch was produced by running `2to3 -f except -w -n .`.
author Gregory Szorc <gregory.szorc@gmail.com>
date Tue, 23 Jun 2015 22:20:08 -0700
parents 1ffeeb91c55d
children 6a98f9408a50
comparison
equal deleted inserted replaced
25659:d60678a567a9 25660:328739ea70c3
21 pass 21 pass
22 22
23 for filename in sys.argv[1:]: 23 for filename in sys.argv[1:]:
24 try: 24 try:
25 fp = open(filename, 'rb') 25 fp = open(filename, 'rb')
26 except IOError, msg: 26 except IOError as msg:
27 sys.stderr.write('%s: Can\'t open: %s\n' % (filename, msg)) 27 sys.stderr.write('%s: Can\'t open: %s\n' % (filename, msg))
28 sys.exit(1) 28 sys.exit(1)
29 29
30 m = md5() 30 m = md5()
31 try: 31 try:
32 while True: 32 while True:
33 data = fp.read(8192) 33 data = fp.read(8192)
34 if not data: 34 if not data:
35 break 35 break
36 m.update(data) 36 m.update(data)
37 except IOError, msg: 37 except IOError as msg:
38 sys.stderr.write('%s: I/O error: %s\n' % (filename, msg)) 38 sys.stderr.write('%s: I/O error: %s\n' % (filename, msg))
39 sys.exit(1) 39 sys.exit(1)
40 sys.stdout.write('%s %s\n' % (m.hexdigest(), filename)) 40 sys.stdout.write('%s %s\n' % (m.hexdigest(), filename))
41 41
42 sys.exit(0) 42 sys.exit(0)