summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2020-08-09 20:08:30 (GMT)
committerGitHub <noreply@github.com>2020-08-09 20:08:30 (GMT)
commitf2e161c27964a59bc5ab20d96f87ba5862c6222d (patch)
tree9be01aee71ca931edbca893b632437c81a8ccc49 /Lib
parent8b67bf907c51846853127176cbb2982d102a2c2d (diff)
downloadcpython-f2e161c27964a59bc5ab20d96f87ba5862c6222d.zip
cpython-f2e161c27964a59bc5ab20d96f87ba5862c6222d.tar.gz
cpython-f2e161c27964a59bc5ab20d96f87ba5862c6222d.tar.bz2
bpo-41468: Improve and test IDLE run error exit (GH-21798)
A message box pops up when an unexpected error stops the run process. Tell users it is likely a random glitch, but report it if not.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/idlelib/NEWS.txt3
-rw-r--r--Lib/idlelib/idle_test/test_run.py32
-rw-r--r--Lib/idlelib/run.py23
3 files changed, 48 insertions, 10 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index e0a6719..fd76207 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,9 @@ Released on 2020-10-05?
======================================
+bpo-41468: Improve IDLE run crash error message (which users should
+never see).
+
bpo-41373: Save files loaded with no line ending, as when blank, or
different line endings, by setting its line ending to the system
default. Fix regression in 3.8.4 and 3.9.0b4.
diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index e2bdf1c..469c13d 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -1,9 +1,10 @@
-"Test run, coverage 42%."
+"Test run, coverage 49%."
from idlelib import run
import unittest
from unittest import mock
-from test.support import captured_stderr
+from idlelib.idle_test.mock_idle import Func
+from test.support import captured_output, captured_stderr
import io
import sys
@@ -323,5 +324,32 @@ class RecursionLimitTest(unittest.TestCase):
self.assertEqual(func.__doc__, "more")
+class HandleErrorTest(unittest.TestCase):
+ # Method of MyRPCServer
+ func = Func()
+ @mock.patch('idlelib.run.thread.interrupt_main', new=func)
+ def test_error(self):
+ eq = self.assertEqual
+ with captured_output('__stderr__') as err:
+ try:
+ raise EOFError
+ except EOFError:
+ run.MyRPCServer.handle_error(None, 'abc', '123')
+ eq(run.exit_now, True)
+ run.exit_now = False
+ eq(err.getvalue(), '')
+
+ try:
+ raise IndexError
+ except IndexError:
+ run.MyRPCServer.handle_error(None, 'abc', '123')
+ eq(run.quitting, True)
+ run.quitting = False
+ msg = err.getvalue()
+ self.assertIn('abc', msg)
+ self.assertIn('123', msg)
+ self.assertIn('IndexError', msg)
+ eq(self.func.called, 2)
+
if __name__ == '__main__':
unittest.main(verbosity=2)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 5bd84aa..1e84ecc 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -387,14 +387,21 @@ class MyRPCServer(rpc.RPCServer):
thread.interrupt_main()
except:
erf = sys.__stderr__
- print('\n' + '-'*40, file=erf)
- print('Unhandled server exception!', file=erf)
- print('Thread: %s' % threading.current_thread().name, file=erf)
- print('Client Address: ', client_address, file=erf)
- print('Request: ', repr(request), file=erf)
- traceback.print_exc(file=erf)
- print('\n*** Unrecoverable, server exiting!', file=erf)
- print('-'*40, file=erf)
+ print(textwrap.dedent(f"""
+ {'-'*40}
+ Unhandled exception in user code execution server!'
+ Thread: {threading.current_thread().name}
+ IDLE Client Address: {client_address}
+ Request: {request!r}
+ """), file=erf)
+ traceback.print_exc(limit=-20, file=erf)
+ print(textwrap.dedent(f"""
+ *** Unrecoverable, server exiting!
+
+ Users should never see this message; it is likely transient.
+ If this recurs, report this with a copy of the message
+ and an explanation of how to make it repeat.
+ {'-'*40}"""), file=erf)
quitting = True
thread.interrupt_main()