From bee64533d68e35e9516cc2121afd0db1e063fa8c Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 27 Apr 1998 19:35:15 +0000 Subject: Use a try-except so that the pickle file is written even when we die because of an unexpected exception. --- Tools/webchecker/webchecker.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/Tools/webchecker/webchecker.py b/Tools/webchecker/webchecker.py index 5459e97..bf56cec 100755 --- a/Tools/webchecker/webchecker.py +++ b/Tools/webchecker/webchecker.py @@ -183,24 +183,28 @@ def main(): for arg in args: c.addroot(arg) - if not norun: + try: + + if not norun: + try: + c.run() + except KeyboardInterrupt: + if verbose > 0: + print "[run interrupted]" + try: - c.run() + c.report() except KeyboardInterrupt: if verbose > 0: - print "[run interrupted]" + print "[report interrupted]" - try: - c.report() - except KeyboardInterrupt: - if verbose > 0: - print "[report interrupted]" - - if c.save_pickle(dumpfile): - if dumpfile == DUMPFILE: - print "Use ``%s -R'' to restart." % sys.argv[0] - else: - print "Use ``%s -R -d %s'' to restart." % (sys.argv[0], dumpfile) + finally: + if c.save_pickle(dumpfile): + if dumpfile == DUMPFILE: + print "Use ``%s -R'' to restart." % sys.argv[0] + else: + print "Use ``%s -R -d %s'' to restart." % (sys.argv[0], + dumpfile) def load_pickle(dumpfile=DUMPFILE, verbose=VERBOSE): -- cgit v0.12