[Python-checkins] bpo-37692: Improve highlight config sample (#14983)

Sun Jul 28 12:04:48 EDT 2019

https://github.com/python/cpython/commit/b222955355c8077a3ceca79195731663d7c3dd5f
commit: b222955355c8077a3ceca79195731663d7c3dd5f
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2019年07月28日T12:04:31-04:00
summary:
bpo-37692: Improve highlight config sample (#14983)
Use an example shell interaction in the sample and better labels for shell elements.
files:
A Misc/NEWS.d/next/IDLE/2019-07-27-15-14-20.bpo-37692.TRHGjD.rst
M Lib/idlelib/configdialog.py

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 4df6ecee69f1..bba17d34938d 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -808,7 +808,7 @@ def create_page_highlight(self):
 (*)theme_message: Label
 """
 self.theme_elements = {
- 'Normal Text': ('normal', '00'),
+ 'Normal Code or Text': ('normal', '00'),
 'Code Context': ('context', '01'),
 'Python Keywords': ('keyword', '02'),
 'Python Definitions': ('definition', '03'),
@@ -819,10 +819,10 @@ def create_page_highlight(self):
 'Found Text': ('hit', '08'),
 'Cursor': ('cursor', '09'),
 'Editor Breakpoint': ('break', '10'),
- 'Shell Normal Text': ('console', '11'),
- 'Shell Error Text': ('error', '12'),
- 'Shell Stdout Text': ('stdout', '13'),
- 'Shell Stderr Text': ('stderr', '14'),
+ 'Shell Prompt': ('console', '11'),
+ 'Error Text': ('error', '12'),
+ 'Shell User Output': ('stdout', '13'),
+ 'Shell User Exception': ('stderr', '14'),
 'Line Number': ('linenumber', '16'),
 }
 self.builtin_name = tracers.add(
@@ -852,27 +852,26 @@ def create_page_highlight(self):
 takefocus=FALSE, highlightthickness=0, wrap=NONE)
 text.bind('<Double-Button-1>', lambda e: 'break')
 text.bind('<B1-Motion>', lambda e: 'break')
- text_and_tags=(
- ('\n', 'normal'),
- ('#you can click here', 'comment'), ('\n', 'normal'),
- ('#to choose items', 'comment'), ('\n', 'normal'),
- ('code context section', 'context'), ('\n\n', 'normal'),
+ string_tags=(
+ ('# Click selects item.', 'comment'), ('\n', 'normal'),
+ ('code context section', 'context'), ('\n', 'normal'),
+ ('| cursor', 'cursor'), ('\n', 'normal'),
 ('def', 'keyword'), (' ', 'normal'),
 ('func', 'definition'), ('(param):\n ', 'normal'),
- ('"""string"""', 'string'), ('\n var0 = ', 'normal'),
+ ('"Return None."', 'string'), ('\n var0 = ', 'normal'),
 ("'string'", 'string'), ('\n var1 = ', 'normal'),
 ("'selected'", 'hilite'), ('\n var2 = ', 'normal'),
 ("'found'", 'hit'), ('\n var3 = ', 'normal'),
 ('list', 'builtin'), ('(', 'normal'),
 ('None', 'keyword'), (')\n', 'normal'),
 (' breakpoint("line")', 'break'), ('\n\n', 'normal'),
- (' error ', 'error'), (' ', 'normal'),
- ('cursor |', 'cursor'), ('\n ', 'normal'),
- ('shell', 'console'), (' ', 'normal'),
- ('stdout', 'stdout'), (' ', 'normal'),
- ('stderr', 'stderr'), ('\n\n', 'normal'))
- for texttag in text_and_tags:
- text.insert(END, texttag[0], texttag[1])
+ ('>>>', 'console'), (' 3.14**2\n', 'normal'),
+ ('9.8596', 'stdout'), ('\n', 'normal'),
+ ('>>>', 'console'), (' pri ', 'normal'),
+ ('n', 'error'), ('t(\n', 'normal'),
+ ('SyntaxError', 'stderr'), ('\n', 'normal'))
+ for string, tag in string_tags:
+ text.insert(END, string, tag)
 n_lines = len(text.get('1.0', END).splitlines())
 for lineno in range(1, n_lines):
 text.insert(f'{lineno}.0',
diff --git a/Misc/NEWS.d/next/IDLE/2019-07-27-15-14-20.bpo-37692.TRHGjD.rst b/Misc/NEWS.d/next/IDLE/2019-07-27-15-14-20.bpo-37692.TRHGjD.rst
new file mode 100644
index 000000000000..b3beadc1e026
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2019-07-27-15-14-20.bpo-37692.TRHGjD.rst
@@ -0,0 +1,2 @@
+Improve highlight config sample with example shell interaction and better
+labels for shell elements.
