--- Lib/test/regrtest.py +++ Lib/test/regrtest.py @@ -363,7 +363,7 @@ try: result = runtest(*args, **kwargs) except BaseException, e: - result = INTERRUPTED, e.__class__.__name__ + result = INTERRUPTED, 0.0, e.__class__.__name__ print # Force a newline (just in case) print json.dumps(result) sys.exit(0) @@ -465,7 +465,7 @@ save_modules = sys.modules.keys() def accumulate_result(test, result): - ok, test_time = result + ok, test_time = result[:2] test_times.append((test_time, test)) if ok == PASSED: good.append(test) @@ -565,8 +565,7 @@ sys.stdout.flush() sys.stderr.flush() if result[0] == INTERRUPTED: - assert result[1] == 'KeyboardInterrupt' - raise KeyboardInterrupt # What else? + raise KeyboardInterrupt accumulate_result(test, result) if not quiet: fmt = "[{1:{0}}{2}/{3}] {4}" if bad else "[{1:{0}}{2}] {4}"