From c06e48f7e476282133846b1c4c6de5835122ce18 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 25 Mar 2016 10:55:21 -0500 Subject: [PATCH 1/2] Fix interrupt handling on windows --- spyderlib/app/spyder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spyderlib/app/spyder.py b/spyderlib/app/spyder.py index 6d9763fe96c..1a1e8c76ff7 100644 --- a/spyderlib/app/spyder.py +++ b/spyderlib/app/spyder.py @@ -274,7 +274,7 @@ def __init__(self, options=None): self.debug_print("Start of MainWindow constructor") - def signal_handler(signum, frame): + def signal_handler(signum, frame=None): """Handler for signals.""" sys.stdout.write('Handling signal: %s\n' % signum) sys.stdout.flush() From 2ca2c1bf2940a97bb921b9fbf0b21fa97e570f1f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 25 Mar 2016 12:42:58 -0500 Subject: [PATCH 2/2] Make win32api optional --- spyderlib/app/spyder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spyderlib/app/spyder.py b/spyderlib/app/spyder.py index 1a1e8c76ff7..74a3fd7f7c0 100644 --- a/spyderlib/app/spyder.py +++ b/spyderlib/app/spyder.py @@ -285,8 +285,7 @@ def signal_handler(signum, frame=None): import win32api win32api.SetConsoleCtrlHandler(signal_handler, True) except ImportError: - version = '.'.join(map(str, sys.version_info[:2])) - raise Exception('pywin32 not installed for Python ' + version) + pass else: signal.signal(signal.SIGTERM, signal_handler)