From f5056a1cca918cf58becfd4fcae52f4c3dc6de6a Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 17 Jul 2011 16:30:17 +0200 Subject: [PATCH] [activator,reagent] do not print stack content in case of KeyboardInterrupt exception --- server/activator.py | 6 +++--- server/reagent.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/activator.py b/server/activator.py index c1f0dfd9f..fddb83080 100644 --- a/server/activator.py +++ b/server/activator.py @@ -86,12 +86,12 @@ def handle_exception(exc_class, exc_instance, exc_tb): uninstall_exception_handler() entropy.tools.kill_threads() - # always slap exception data (including stack content) - entropy.tools.print_exception(tb_data = exc_tb) - if exc_class is KeyboardInterrupt: raise SystemExit(1) + # always slap exception data (including stack content) + entropy.tools.print_exception(tb_data = exc_tb) + raise exc_instance def install_exception_handler(): diff --git a/server/reagent.py b/server/reagent.py index d2073cf9c..aa5e0c411 100644 --- a/server/reagent.py +++ b/server/reagent.py @@ -132,12 +132,12 @@ def handle_exception(exc_class, exc_instance, exc_tb): uninstall_exception_handler() entropy.tools.kill_threads() - # always slap exception data (including stack content) - entropy.tools.print_exception(tb_data = exc_tb) - if exc_class is KeyboardInterrupt: raise SystemExit(1) + # always slap exception data (including stack content) + entropy.tools.print_exception(tb_data = exc_tb) + raise exc_instance def install_exception_handler():