Backport bug fix for SF bug report #1546372.

This commit is contained in:
Marc-André Lemburg 2006-09-06 20:38:50 +00:00
parent 4dc095249e
commit 8a230b50a1
2 changed files with 14 additions and 2 deletions

View file

@ -83,6 +83,13 @@ Documentation
to a newly created list object and add notes that this isn't a good idea. to a newly created list object and add notes that this isn't a good idea.
Tools
-----
- Bug #1546372: Fixed small bugglet in pybench that caused a missing
file not to get reported properly.
Build Build
----- -----

View file

@ -885,7 +885,7 @@ python pybench.py -s p25.pybench -c p21.pybench
else: else:
bench.print_benchmark(hidenoise=hidenoise, bench.print_benchmark(hidenoise=hidenoise,
limitnames=limitnames) limitnames=limitnames)
except IOError: except IOError, reason:
print '* Error opening/reading file %s: %s' % ( print '* Error opening/reading file %s: %s' % (
repr(show_bench), repr(show_bench),
reason) reason)
@ -931,8 +931,13 @@ python pybench.py -s p25.pybench -c p21.pybench
bench.name = reportfile bench.name = reportfile
pickle.dump(bench,f) pickle.dump(bench,f)
f.close() f.close()
except IOError: except IOError, reason:
print '* Error opening/writing reportfile' print '* Error opening/writing reportfile'
except IOError, reason:
print '* Error opening/writing reportfile %s: %s' % (
reportfile,
reason)
print
if __name__ == '__main__': if __name__ == '__main__':
PyBenchCmdline() PyBenchCmdline()