IDLE has two main window types, the Shell window and the Editor window. It is
possible to have multiple editor windows simultaneously. On Windows and
Linux, each has its own top menu. Each menu documented below indicates
@@ -131,20 +249,20 @@
Reformat the current blank-line-delimited paragraph in comment block or
+multiline string or selected line in a string. All lines in the
+paragraph will be formatted to less than N columns, where N defaults to 72.
+
Indent Region
Shift selected lines right by the indent width (default 4 spaces).
Dedent Region
Shift selected lines left by the indent width (default 4 spaces).
Do Check Module. If no error, restart the shell to clean the
environment, then execute the module. Output is displayed in the Shell
@@ -280,9 +401,9 @@
Look on the current line. with the cursor, and the line above for a filename
and line number. If found, open the file if not already open, and show the
@@ -317,9 +438,9 @@
Open a configuration dialog and change preferences for the following:
fonts, indentation, keybindings, text color themes, startup windows and
@@ -349,14 +470,14 @@
IDLE may open editor windows when it starts, depending on settings
and how you start IDLE. Thereafter, use the File menu. There can be only
one open editor window for a given file.
The IDLE insertion cursor is a thin vertical bar between character
+positions. When characters are entered, the insertion cursor and
+everything to its right moves right one character and
+the new character is entered in the new space.
+
Several non-character keys move the cursor and possibly
+delete characters. Deletion does not puts text on the clipboard,
+but IDLE has an undo list. Wherever this doc discusses keys,
+‘C’ refers to the Control key on Windows and
+Unix and the Command key on macOS. (And all such dicussions
+assume that the keys have not been re-bound to something else.)
+
+
Arrow keys move the cursor one character or line.
+
C-LeftArrow and C-RightArrow moves left or right one word.
+
Home and End go to the beginning or end of the line.
+
Page Up and Page Down go up or down one screen.
+
C-Home and C-End go to beginning or end of the file.
+
Backspace and Del (or C-d) delete the previous or
+next character.
+
C-Backspace and C-Del delete one word left or right.
+
C-k deletes (‘kills’) everything to the right.
-
Standard keybindings (like C-c to copy and C-v to paste)
+
Standard keybindings (like C-c to copy and C-v to paste)
may work. Keybindings are selected in the Configure IDLE dialog.
After a block-opening statement, the next line is indented by 4 spaces (in the
Python Shell window by one tab). After certain keywords (break, return etc.)
the next line is dedented. In leading indentation, Backspace deletes up
@@ -465,9 +580,16 @@
Any selection becomes a search target. However, only selections within
+a line work because searches are only performed within lines with the
+terminal newline removed. If [x]Regularexpression is checked, the
+target is interpreted according to the Python re module.
Completions are supplied, when requested and available, for module
names, attributes of classes or functions, or filenames. Each request
method displays a completion box with existing names. (See tab
@@ -489,7 +611,7 @@
A calltip is shown automatically when one types ( after the name
of an accessible function. A function name expression may include
dots and subscripts. A calltip remains until it is clicked, the cursor
@@ -535,9 +657,9 @@
Within an editor window containing Python code, code context can be toggled
in order to show or hide a pane at the top of the window. When shown, this
pane freezes the opening lines for block code, such as those beginning with
@@ -550,33 +672,39 @@
In IDLE’s Shell, enter, edit, and recall complete statements. (Most
+consoles and terminals only work with a single physical line at a time).
+
Submit a single-line statement for execution by hitting Return
+with the cursor anywhere on the line. If a line is extended with
+Backslash (\), the cursor must be on the last physical line.
+Submit a multi-line compound statement by entering a blank line after
+the statement.
When one pastes code into Shell, it is not compiled and possibly executed
-until one hits Return. One may edit pasted code first.
-If one pastes more that one statement into Shell, the result will be a
+until one hits Return, as specified above.
+One may edit pasted code first.
+If one pastes more than one statement into Shell, the result will be a
SyntaxError when multiple statements are compiled as if they were one.
+
Lines containing RESTART mean that the user execution process has been
+re-started. This occurs when the user execution process has crashed,
+when one requests a restart on the Shell menu, or when one runs code
+in an editor window.
The editing features described in previous subsections work when entering
-code interactively. IDLE’s Shell window also responds to the following keys.
-
-
C-c interrupts executing command
-
C-d sends end-of-file; closes window if typed at a >>> prompt
-
Alt-/ (Expand word) is also useful to reduce typing
-
Command history
+code interactively. IDLE’s Shell window also responds to the following:
-
Alt-p retrieves previous command matching what you have typed. On
-macOS use C-p.
-
Alt-n retrieves next. On macOS use C-n.
-
Return while on any previous command retrieves that command
-
-
+
C-c attemps to interrupt statement execution (but may fail).
+
C-d closes Shell if typed at a >>> prompt.
+
Alt-p and Alt-n (C-p and C-n on macOS)
+retrieve to the current prompt the previous or next previously
+entered statement that matches anything already typed.
+
Return while the cursor is on any previous statement
+appends the latter to anything already typed at the prompt.
Idle defaults to black on white text, but colors text with special meanings.
For the shell, these are shell output, shell error, user output, and
user error. For Python code, at the shell prompt or in an editor, these are
@@ -592,10 +720,10 @@
Upon startup with the -s option, IDLE will execute the file referenced by
the environment variables IDLESTARTUP or PYTHONSTARTUP.
IDLE first checks for IDLESTARTUP; if IDLESTARTUP is present the file
@@ -608,8 +736,8 @@
IDLE uses a socket to communicate between the IDLE GUI process and the user
code execution process. A connection must be established whenever the Shell
starts or restarts. (The latter is indicated by a divider line that says
@@ -684,9 +812,9 @@
With rare exceptions, the result of executing Python code with IDLE is
intended to be the same as executing the same code by the default method,
directly with Python in a text-mode system console or terminal window.
@@ -711,7 +839,9 @@
When a program outputs text, the result is determined by the
corresponding output device. When IDLE executes user code, sys.stdout
and sys.stderr are connected to the display area of IDLE’s Shell. Some of
@@ -780,9 +910,9 @@
IDLE is intentionally different from standard Python in order to
facilitate development of tkinter programs. Enter importtkinterastk;root=tk.Tk() in standard Python and nothing appears. Enter the same
@@ -800,9 +930,9 @@
By default, IDLE executes user code in a separate subprocess via a socket,
which uses the internal loopback interface. This connection is not
externally visible and no data is sent to or received from the internet.
@@ -825,12 +955,12 @@
Help menu entry “IDLE Help” displays a formatted html version of the
IDLE chapter of the Library Reference. The result, in a read-only
tkinter text window, is close to what one sees in a web browser.
@@ -845,9 +975,9 @@
The font preferences, highlighting, keys, and general preferences can be
changed via Configure IDLE on the Option menu.
Non-default user settings are saved in a .idlerc directory in the user’s
@@ -863,23 +993,35 @@
Under System Preferences: Dock, one can set “Prefer tabs when opening
documents” to “Always”. This setting is not compatible with the tk/tkinter
GUI framework used by IDLE, and it breaks a few IDLE features.
IDLE contains an extension facility. Preferences for extensions can be
changed with the Extensions tab of the preferences dialog. See the
beginning of config-extensions.def in the idlelib directory for further
information. The only current default extension is zzdummy, an example
also used for testing.
The Lib/idlelib package implements the IDLE application. See the rest
+of this page for how to use IDLE.
+
The files in idlelib are described in idlelib/README.txt. Access it
+either in idlelib or click Help => About IDLE on the IDLE menu. This
+file also maps IDLE menu items to the code that implements the item.
+Except for files listed under ‘Startup’, the idlelib code is ‘private’ in
+sense that feature changes can be backported (see PEP 434).
diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py
index f420d40fb9ea40..bdf4b2b29f11a2 100644
--- a/Lib/idlelib/help.py
+++ b/Lib/idlelib/help.py
@@ -76,9 +76,9 @@ def handle_starttag(self, tag, attrs):
if a == 'class':
class_ = v
s = ''
- if tag == 'div' and class_ == 'section':
+ if tag == 'section' and attrs == [('id', 'idle')]:
self.show = True # Start main content.
- elif tag == 'div' and class_ == 'sphinxsidebar':
+ elif tag == 'div' and class_ == 'clearer':
self.show = False # End main content.
elif tag == 'p' and self.prevtag and not self.prevtag[0]:
# Begin a new block for
tags after a closed tag.
@@ -102,7 +102,7 @@ def handle_starttag(self, tag, attrs):
if self.level > 0:
self.nested_dl = True
elif tag == 'li':
- s = '\n* ' if self.simplelist else '\n\n* '
+ s = '\n* '
elif tag == 'dt':
s = '\n\n' if not self.nested_dl else '\n' # Avoid extra line.
self.nested_dl = False
@@ -241,12 +241,13 @@ def __init__(self, parent, filename, title):
Toplevel.__init__(self, parent)
self.wm_title(title)
self.protocol("WM_DELETE_WINDOW", self.destroy)
- HelpFrame(self, filename).grid(column=0, row=0, sticky='nsew')
+ self.frame = HelpFrame(self, filename)
+ self.frame.grid(column=0, row=0, sticky='nsew')
self.grid_columnconfigure(0, weight=1)
self.grid_rowconfigure(0, weight=1)
-def copy_strip():
+def copy_strip(): # pragma: no cover
"""Copy idle.html to idlelib/help.html, stripping trailing whitespace.
Files with trailing whitespace cannot be pushed to the git cpython
@@ -278,13 +279,15 @@ def copy_strip():
out.write(line.rstrip() + b'\n')
print(f'{src} copied to {dst}')
+
def show_idlehelp(parent):
"Create HelpWindow; called from Idle Help event handler."
filename = join(abspath(dirname(__file__)), 'help.html')
- if not isfile(filename):
+ if not isfile(filename): # pragma: no cover
# Try copy_strip, present message.
return
- HelpWindow(parent, filename, 'IDLE Help (%s)' % python_version())
+ return HelpWindow(parent, filename, 'IDLE Doc (%s)' % python_version())
+
if __name__ == '__main__':
from unittest import main
diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py
index 9cb3ba78c50ebd..aa1c352897f9e7 100644
--- a/Lib/idlelib/help_about.py
+++ b/Lib/idlelib/help_about.py
@@ -11,15 +11,12 @@
from idlelib import textview
-version = python_version()
+pyver = python_version()
-
-def build_bits():
- "Return bits for platform."
- if sys.platform == 'darwin':
- return '64' if sys.maxsize > 2**32 else '32'
- else:
- return architecture()[0][:2]
+if sys.platform == 'darwin':
+ bits = '64' if sys.maxsize > 2**32 else '32'
+else:
+ bits = architecture()[0][:2]
class AboutDialog(Toplevel):
@@ -45,7 +42,7 @@ def __init__(self, parent, title=None, *, _htest=False, _utest=False):
self.create_widgets()
self.resizable(height=False, width=False)
self.title(title or
- f'About IDLE {version} ({build_bits()} bit)')
+ f'About IDLE {pyver} ({bits} bit)')
self.transient(parent)
self.grab_set()
self.protocol("WM_DELETE_WINDOW", self.ok)
@@ -76,8 +73,8 @@ def create_widgets(self):
bg=self.bg, font=('courier', 24, 'bold'))
header.grid(row=0, column=0, sticky=E, padx=10, pady=10)
- tk_patchlevel = self.info_patchlevel()
- ext = '.png' if tk_patchlevel >= (8, 6) else '.gif'
+ tkpatch = self._root().getvar('tk_patchLevel')
+ ext = '.png' if tkpatch >= '8.6' else '.gif'
icon = os.path.join(os.path.abspath(os.path.dirname(__file__)),
'Icons', f'idle_48{ext}')
self.icon_image = PhotoImage(master=self._root(), file=icon)
@@ -91,8 +88,9 @@ def create_widgets(self):
email = Label(frame_background, text='email: idle-dev@python.org',
justify=LEFT, fg=self.fg, bg=self.bg)
email.grid(row=6, column=0, columnspan=2, sticky=W, padx=10, pady=0)
- docs = Label(frame_background, text="https://docs.python.org/"
- f"{version[:version.rindex('.')]}/library/idle.html",
+ docs_url = ("https://docs.python.org/%d.%d/library/idle.html" %
+ sys.version_info[:2])
+ docs = Label(frame_background, text=docs_url,
justify=LEFT, fg=self.fg, bg=self.bg)
docs.grid(row=7, column=0, columnspan=2, sticky=W, padx=10, pady=0)
docs.bind("", lambda event: webbrowser.open(docs['text']))
@@ -101,13 +99,11 @@ def create_widgets(self):
height=2, bg=self.bg).grid(row=8, column=0, sticky=EW,
columnspan=3, padx=5, pady=5)
- pyver = Label(frame_background,
- text='Python version: ' + version,
- fg=self.fg, bg=self.bg)
- pyver.grid(row=9, column=0, sticky=W, padx=10, pady=0)
- tkver = Label(frame_background, text=f'Tk version: {tk_patchlevel}',
- fg=self.fg, bg=self.bg)
- tkver.grid(row=9, column=1, sticky=W, padx=2, pady=0)
+ tclver = str(self.info_patchlevel())
+ tkver = ' and ' + tkpatch if tkpatch != tclver else ''
+ versions = f"Python {pyver} with tcl/tk {tclver}{tkver}"
+ vers = Label(frame_background, text=versions, fg=self.fg, bg=self.bg)
+ vers.grid(row=9, column=0, sticky=W, padx=10, pady=0)
py_buttons = Frame(frame_background, bg=self.bg)
py_buttons.grid(row=10, column=0, columnspan=2, sticky=NSEW)
self.py_license = Button(py_buttons, text='License', width=8,
@@ -127,17 +123,17 @@ def create_widgets(self):
height=2, bg=self.bg).grid(row=11, column=0, sticky=EW,
columnspan=3, padx=5, pady=5)
- idlever = Label(frame_background,
- text='IDLE version: ' + version,
+ idle = Label(frame_background,
+ text='IDLE',
fg=self.fg, bg=self.bg)
- idlever.grid(row=12, column=0, sticky=W, padx=10, pady=0)
+ idle.grid(row=12, column=0, sticky=W, padx=10, pady=0)
idle_buttons = Frame(frame_background, bg=self.bg)
idle_buttons.grid(row=13, column=0, columnspan=3, sticky=NSEW)
- self.readme = Button(idle_buttons, text='README', width=8,
+ self.readme = Button(idle_buttons, text='Readme', width=8,
highlightbackground=self.bg,
command=self.show_readme)
self.readme.pack(side=LEFT, padx=10, pady=10)
- self.idle_news = Button(idle_buttons, text='NEWS', width=8,
+ self.idle_news = Button(idle_buttons, text='News', width=8,
highlightbackground=self.bg,
command=self.show_idle_news)
self.idle_news.pack(side=LEFT, padx=10, pady=10)
@@ -171,7 +167,7 @@ def show_readme(self):
def show_idle_news(self):
"Handle News button event."
- self.display_file_text('About - NEWS', 'NEWS.txt', 'utf-8')
+ self.display_file_text('About - News', 'News3.txt', 'utf-8')
def display_printer_text(self, title, printer):
"""Create textview for built-in constants.
diff --git a/Lib/idlelib/history.py b/Lib/idlelib/history.py
index 100f505256a940..5a9b32aaf6bb81 100644
--- a/Lib/idlelib/history.py
+++ b/Lib/idlelib/history.py
@@ -65,7 +65,7 @@ def fetch(self, reverse):
self.text.bell()
return
nprefix = len(prefix)
- while 1:
+ while True:
pointer += -1 if reverse else 1
if pointer < 0 or pointer >= nhist:
self.text.bell()
diff --git a/Lib/idlelib/hyperparser.py b/Lib/idlelib/hyperparser.py
index 77baca782b3fdc..76144ee8fb30f5 100644
--- a/Lib/idlelib/hyperparser.py
+++ b/Lib/idlelib/hyperparser.py
@@ -237,9 +237,9 @@ def get_expression(self):
last_identifier_pos = pos
postdot_phase = True
- while 1:
+ while True:
# Eat whitespaces, comments, and if postdot_phase is False - a dot
- while 1:
+ while True:
if pos>brck_limit and rawtext[pos-1] in self._whitespace_chars:
# Eat a whitespace
pos -= 1
diff --git a/Lib/idlelib/idle_test/README.txt b/Lib/idlelib/idle_test/README.txt
index 566bfd179fdf1b..cacd06db873d03 100644
--- a/Lib/idlelib/idle_test/README.txt
+++ b/Lib/idlelib/idle_test/README.txt
@@ -146,14 +146,17 @@ python -m unittest -v idlelib.idle_test
python -m test -v -ugui test_idle
python -m test.test_idle
-The idle tests are 'discovered' by
-idlelib.idle_test.__init__.load_tests, which is also imported into
-test.test_idle. Normally, neither file should be changed when working on
-individual test modules. The third command runs unittest indirectly
-through regrtest. The same happens when the entire test suite is run
-with 'python -m test'. So that command must work for buildbots to stay
-green. Idle tests must not disturb the environment in a way that makes
-other tests fail (issue 18081).
+IDLE tests are 'discovered' by idlelib.idle_test.__init__.load_tests
+when this is imported into test.test_idle. Normally, neither file
+should be changed when working on individual test modules. The third
+command runs unittest indirectly through regrtest. The same happens when
+the entire test suite is run with 'python -m test'. So that command must
+work for buildbots to stay green. IDLE tests must not disturb the
+environment in a way that makes other tests fail (GH-62281).
+
+To test subsets of modules, see idlelib.idle_test.__init__. This
+can be used to find refleaks or possible sources of "Theme changed"
+tcl messages (GH-71383).
To run an individual Testcase or test method, extend the dotted name
given to unittest on the command line or use the test -m option. The
diff --git a/Lib/idlelib/idle_test/__init__.py b/Lib/idlelib/idle_test/__init__.py
index ad067b405cab67..79b5d102dd7da5 100644
--- a/Lib/idlelib/idle_test/__init__.py
+++ b/Lib/idlelib/idle_test/__init__.py
@@ -1,17 +1,27 @@
-'''idlelib.idle_test is a private implementation of test.test_idle,
-which tests the IDLE application as part of the stdlib test suite.
-Run IDLE tests alone with "python -m test.test_idle".
-Starting with Python 3.6, IDLE requires tcl/tk 8.5 or later.
+"""idlelib.idle_test implements test.test_idle, which tests the IDLE
+application as part of the stdlib test suite.
+Run IDLE tests alone with "python -m test.test_idle (-v)".
This package and its contained modules are subject to change and
any direct use is at your own risk.
-'''
+"""
from os.path import dirname
+# test_idle imports load_tests for test discovery (default all).
+# To run subsets of idlelib module tests, insert '[]' after '_'.
+# Example: insert '[ac]' for modules beginning with 'a' or 'c'.
+# Additional .discover/.addTest pairs with separate inserts work.
+# Example: pairs with 'c' and 'g' test c* files and grep.
+
def load_tests(loader, standard_tests, pattern):
this_dir = dirname(__file__)
top_dir = dirname(dirname(this_dir))
- package_tests = loader.discover(start_dir=this_dir, pattern='test*.py',
+ module_tests = loader.discover(start_dir=this_dir,
+ pattern='test_*.py', # Insert here.
top_level_dir=top_dir)
- standard_tests.addTests(package_tests)
+ standard_tests.addTests(module_tests)
+## module_tests = loader.discover(start_dir=this_dir,
+## pattern='test_*.py', # Insert here.
+## top_level_dir=top_dir)
+## standard_tests.addTests(module_tests)
return standard_tests
diff --git a/Lib/idlelib/idle_test/example_stub.pyi b/Lib/idlelib/idle_test/example_stub.pyi
index a9811a78d10a6e..17b58010a9d8de 100644
--- a/Lib/idlelib/idle_test/example_stub.pyi
+++ b/Lib/idlelib/idle_test/example_stub.pyi
@@ -1,2 +1,4 @@
+" Example to test recognition of .pyi file as Python source code.
+
class Example:
def method(self, argument1: str, argument2: list[int]) -> None: ...
diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py
index d297f8aa0094ee..a7293774eecaeb 100644
--- a/Lib/idlelib/idle_test/htest.py
+++ b/Lib/idlelib/idle_test/htest.py
@@ -1,38 +1,36 @@
-'''Run human tests of Idle's window, dialog, and popup widgets.
-
-run(*tests)
-Create a master Tk window. Within that, run each callable in tests
-after finding the matching test spec in this file. If tests is empty,
-run an htest for each spec dict in this file after finding the matching
-callable in the module named in the spec. Close the window to skip or
-end the test.
-
-In a tested module, let X be a global name bound to a callable (class
-or function) whose .__name__ attribute is also X (the usual situation).
-The first parameter of X must be 'parent'. When called, the parent
-argument will be the root window. X must create a child Toplevel
-window (or subclass thereof). The Toplevel may be a test widget or
-dialog, in which case the callable is the corresponding class. Or the
-Toplevel may contain the widget to be tested or set up a context in
-which a test widget is invoked. In this latter case, the callable is a
-wrapper function that sets up the Toplevel and other objects. Wrapper
-function names, such as _editor_window', should start with '_'.
+"""Run human tests of Idle's window, dialog, and popup widgets.
+
+run(*tests) Create a master Tk() htest window. Within that, run each
+callable in tests after finding the matching test spec in this file. If
+tests is empty, run an htest for each spec dict in this file after
+finding the matching callable in the module named in the spec. Close
+the master window to end testing.
+
+In a tested module, let X be a global name bound to a callable (class or
+function) whose .__name__ attribute is also X (the usual situation). The
+first parameter of X must be 'parent' or 'master'. When called, the
+first argument will be the root window. X must create a child
+Toplevel(parent/master) (or subclass thereof). The Toplevel may be a
+test widget or dialog, in which case the callable is the corresponding
+class. Or the Toplevel may contain the widget to be tested or set up a
+context in which a test widget is invoked. In this latter case, the
+callable is a wrapper function that sets up the Toplevel and other
+objects. Wrapper function names, such as _editor_window', should start
+with '_' and be lowercase.
End the module with
if __name__ == '__main__':
-
+
from idlelib.idle_test.htest import run
- run(X)
+ run(callable) # There could be multiple comma-separated callables.
-To have wrapper functions and test invocation code ignored by coveragepy
-reports, put '# htest #' on the def statement header line.
-
-def _wrapper(parent): # htest #
-
-Also make sure that the 'if __name__' line matches the above. Then have
-make sure that .coveragerc includes the following.
+To have wrapper functions ignored by coverage reports, tag the def
+header like so: "def _wrapper(parent): # htest #". Use the same tag
+for htest lines in widget code. Make sure that the 'if __name__' line
+matches the above. Then have make sure that .coveragerc includes the
+following:
[report]
exclude_lines =
@@ -46,7 +44,7 @@ def _wrapper(parent): # htest #
following template, with X.__name__ prepended to '_spec'.
When all tests are run, the prefix is use to get X.
-_spec = {
+callable_spec = {
'file': '',
'kwds': {'title': ''},
'msg': ""
@@ -54,16 +52,16 @@ def _wrapper(parent): # htest #
file (no .py): run() imports file.py.
kwds: augmented with {'parent':root} and passed to X as **kwds.
-title: an example kwd; some widgets need this, delete if not.
+title: an example kwd; some widgets need this, delete line if not.
msg: master window hints about testing the widget.
-Modules and classes not being tested at the moment:
-pyshell.PyShellEditorWindow
-debugger.Debugger
-autocomplete_w.AutoCompleteWindow
-outwin.OutputWindow (indirectly being tested with grep test)
-'''
+TODO test these modules and classes:
+ autocomplete_w.AutoCompleteWindow
+ debugger.Debugger
+ outwin.OutputWindow (indirectly being tested with grep test)
+ pyshell.PyShellEditorWindow
+"""
import idlelib.pyshell # Set Windows DPI awareness before Tk().
from importlib import import_module
@@ -91,15 +89,6 @@ def _wrapper(parent): # htest #
"Force-open-calltip does not work here.\n"
}
-_module_browser_spec = {
- 'file': 'browser',
- 'kwds': {},
- 'msg': "Inspect names of module, class(with superclass if "
- "applicable), methods and functions.\nToggle nested items.\n"
- "Double clicking on items prints a traceback for an exception "
- "that is ignored."
- }
-
_color_delegator_spec = {
'file': 'colorizer',
'kwds': {},
@@ -109,16 +98,6 @@ def _wrapper(parent): # htest #
"The default color scheme is in idlelib/config-highlight.def"
}
-CustomRun_spec = {
- 'file': 'query',
- 'kwds': {'title': 'Customize query.py Run',
- '_htest': True},
- 'msg': "Enter with or [Run]. Print valid entry to Shell\n"
- "Arguments are parsed into a list\n"
- "Mode is currently restart True or False\n"
- "Close dialog with valid entry, , [Cancel], [X]"
- }
-
ConfigDialog_spec = {
'file': 'configdialog',
'kwds': {'title': 'ConfigDialogTest',
@@ -135,6 +114,24 @@ def _wrapper(parent): # htest #
"changes made have persisted."
}
+CustomRun_spec = {
+ 'file': 'query',
+ 'kwds': {'title': 'Customize query.py Run',
+ '_htest': True},
+ 'msg': "Enter with or [OK]. Print valid entry to Shell\n"
+ "Arguments are parsed into a list\n"
+ "Mode is currently restart True or False\n"
+ "Close dialog with valid entry, , [Cancel], [X]"
+ }
+
+_debug_object_browser_spec = {
+ 'file': 'debugobj',
+ 'kwds': {},
+ 'msg': "Double click on items up to the lowest level.\n"
+ "Attributes of the objects and related information "
+ "will be displayed side-by-side at each level."
+ }
+
# TODO Improve message
_dyn_option_menu_spec = {
'file': 'dynoption',
@@ -152,7 +149,7 @@ def _wrapper(parent): # htest #
"Best to close editor first."
}
-GetKeysDialog_spec = {
+GetKeysWindow_spec = {
'file': 'config_key',
'kwds': {'title': 'Test keybindings',
'action': 'find-again',
@@ -173,8 +170,8 @@ def _wrapper(parent): # htest #
'msg': "Click the 'Show GrepDialog' button.\n"
"Test the various 'Find-in-files' functions.\n"
"The results should be displayed in a new '*Output*' window.\n"
- "'Right-click'->'Go to file/line' anywhere in the search results "
- "should open that file \nin a new EditorWindow."
+ "'Right-click'->'Go to file/line' in the search results\n "
+ "should open that file in a new EditorWindow."
}
HelpSource_spec = {
@@ -190,7 +187,7 @@ def _wrapper(parent): # htest #
"Any url ('www...', 'http...') is accepted.\n"
"Test Browse with and without path, as cannot unittest.\n"
"[Ok] or prints valid entry to shell\n"
- "[Cancel] or prints None to shell"
+ ", [Cancel], or [X] prints None to shell"
}
_io_binding_spec = {
@@ -206,56 +203,36 @@ def _wrapper(parent): # htest #
"Check that changes were saved by opening the file elsewhere."
}
-_linenumbers_drag_scrolling_spec = {
- 'file': 'sidebar',
+_multi_call_spec = {
+ 'file': 'multicall',
'kwds': {},
- 'msg': textwrap.dedent("""\
- 1. Click on the line numbers and drag down below the edge of the
- window, moving the mouse a bit and then leaving it there for a while.
- The text and line numbers should gradually scroll down, with the
- selection updated continuously.
-
- 2. With the lines still selected, click on a line number above the
- selected lines. Only the line whose number was clicked should be
- selected.
-
- 3. Repeat step #1, dragging to above the window. The text and line
- numbers should gradually scroll up, with the selection updated
- continuously.
-
- 4. Repeat step #2, clicking a line number below the selection."""),
+ 'msg': "The following should trigger a print to console or IDLE Shell.\n"
+ "Entering and leaving the text area, key entry, ,\n"
+ ", , , \n"
+ ", and focusing elsewhere."
}
-_multi_call_spec = {
- 'file': 'multicall',
+_module_browser_spec = {
+ 'file': 'browser',
'kwds': {},
- 'msg': "The following actions should trigger a print to console or IDLE"
- " Shell.\nEntering and leaving the text area, key entry, "
- ",\n, , "
- ", \n, and "
- "focusing out of the window\nare sequences to be tested."
+ 'msg': textwrap.dedent("""
+ "Inspect names of module, class(with superclass if applicable),
+ "methods and functions. Toggle nested items. Double clicking
+ "on items prints a traceback for an exception that is ignored.""")
}
_multistatus_bar_spec = {
'file': 'statusbar',
'kwds': {},
'msg': "Ensure presence of multi-status bar below text area.\n"
- "Click 'Update Status' to change the multi-status text"
+ "Click 'Update Status' to change the status text"
}
-_object_browser_spec = {
- 'file': 'debugobj',
- 'kwds': {},
- 'msg': "Double click on items up to the lowest level.\n"
- "Attributes of the objects and related information "
- "will be displayed side-by-side at each level."
- }
-
-_path_browser_spec = {
+PathBrowser_spec = {
'file': 'pathbrowser',
- 'kwds': {},
+ 'kwds': {'_htest': True},
'msg': "Test for correct display of all paths in sys.path.\n"
- "Toggle nested items up to the lowest level.\n"
+ "Toggle nested items out to the lowest level.\n"
"Double clicking on an item prints a traceback\n"
"for an exception that is ignored."
}
@@ -291,6 +268,15 @@ def _wrapper(parent): # htest #
"Click [Close] or [X] to close the 'Replace Dialog'."
}
+_scrolled_list_spec = {
+ 'file': 'scrolledlist',
+ 'kwds': {},
+ 'msg': "You should see a scrollable list of items\n"
+ "Selecting (clicking) or double clicking an item "
+ "prints the name to the console or Idle shell.\n"
+ "Right clicking an item will display a popup."
+ }
+
_search_dialog_spec = {
'file': 'search',
'kwds': {},
@@ -306,15 +292,6 @@ def _wrapper(parent): # htest #
"Its only action is to close."
}
-_scrolled_list_spec = {
- 'file': 'scrolledlist',
- 'kwds': {},
- 'msg': "You should see a scrollable list of items\n"
- "Selecting (clicking) or double clicking an item "
- "prints the name to the console or Idle shell.\n"
- "Right clicking an item will display a popup."
- }
-
show_idlehelp_spec = {
'file': 'help',
'kwds': {},
@@ -322,12 +299,31 @@ def _wrapper(parent): # htest #
"Text is selectable. Window is scrollable."
}
-_stack_viewer_spec = {
+_sidebar_number_scrolling_spec = {
+ 'file': 'sidebar',
+ 'kwds': {},
+ 'msg': textwrap.dedent("""\
+ 1. Click on the line numbers and drag down below the edge of the
+ window, moving the mouse a bit and then leaving it there for a
+ while. The text and line numbers should gradually scroll down,
+ with the selection updated continuously.
+
+ 2. With the lines still selected, click on a line number above
+ or below the selected lines. Only the line whose number was
+ clicked should be selected.
+
+ 3. Repeat step #1, dragging to above the window. The text and
+ line numbers should gradually scroll up, with the selection
+ updated continuously.
+
+ 4. Repeat step #2, clicking a line number below the selection."""),
+ }
+
+_stackbrowser_spec = {
'file': 'stackviewer',
'kwds': {},
'msg': "A stacktrace for a NameError exception.\n"
- "Expand 'idlelib ...' and ''.\n"
- "Check that exc_value, exc_tb, and exc_type are correct.\n"
+ "Should have NameError and 1 traceback line."
}
_tooltip_spec = {
@@ -370,11 +366,12 @@ def _wrapper(parent): # htest #
}
def run(*tests):
+ "Run callables in tests."
root = tk.Tk()
root.title('IDLE htest')
root.resizable(0, 0)
- # a scrollable Label like constant width text widget.
+ # A scrollable Label-like constant width text widget.
frameLabel = tk.Frame(root, padx=10)
frameLabel.pack()
text = tk.Text(frameLabel, wrap='word')
@@ -384,45 +381,44 @@ def run(*tests):
scrollbar.pack(side='right', fill='y', expand=False)
text.pack(side='left', fill='both', expand=True)
- test_list = [] # List of tuples of the form (spec, callable widget)
+ test_list = [] # Make list of (spec, callable) tuples.
if tests:
for test in tests:
test_spec = globals()[test.__name__ + '_spec']
test_spec['name'] = test.__name__
test_list.append((test_spec, test))
else:
- for k, d in globals().items():
- if k.endswith('_spec'):
- test_name = k[:-5]
- test_spec = d
+ for key, dic in globals().items():
+ if key.endswith('_spec'):
+ test_name = key[:-5]
+ test_spec = dic
test_spec['name'] = test_name
mod = import_module('idlelib.' + test_spec['file'])
test = getattr(mod, test_name)
test_list.append((test_spec, test))
+ test_list.reverse() # So can pop in proper order in next_test.
test_name = tk.StringVar(root)
callable_object = None
test_kwds = None
def next_test():
-
nonlocal test_name, callable_object, test_kwds
if len(test_list) == 1:
next_button.pack_forget()
test_spec, callable_object = test_list.pop()
test_kwds = test_spec['kwds']
- test_kwds['parent'] = root
test_name.set('Test ' + test_spec['name'])
- text.configure(state='normal') # enable text editing
- text.delete('1.0','end')
- text.insert("1.0",test_spec['msg'])
- text.configure(state='disabled') # preserve read-only property
+ text['state'] = 'normal' # Enable text replacement.
+ text.delete('1.0', 'end')
+ text.insert("1.0", test_spec['msg'])
+ text['state'] = 'disabled' # Restore read-only property.
def run_test(_=None):
- widget = callable_object(**test_kwds)
+ widget = callable_object(root, **test_kwds)
try:
- print(widget.result)
+ print(widget.result) # Only true for query classes(?).
except AttributeError:
pass
@@ -441,5 +437,6 @@ def close(_=None):
next_test()
root.mainloop()
+
if __name__ == '__main__':
run()
diff --git a/Lib/idlelib/idle_test/test_browser.py b/Lib/idlelib/idle_test/test_browser.py
index 03a50f22ca1e82..6cfea3888cd6a9 100644
--- a/Lib/idlelib/idle_test/test_browser.py
+++ b/Lib/idlelib/idle_test/test_browser.py
@@ -5,6 +5,7 @@
import unittest
from unittest import mock
from idlelib.idle_test.mock_idle import Func
+from idlelib.util import py_extensions
from collections import deque
import os.path
@@ -57,6 +58,15 @@ def test_close(self):
self.assertTrue(mb.node.destroy.called)
del mb.top.destroy, mb.node.destroy
+ def test_is_browseable_extension(self):
+ path = "/path/to/file"
+ for ext in py_extensions:
+ with self.subTest(ext=ext):
+ filename = f'{path}{ext}'
+ actual = browser.is_browseable_extension(filename)
+ expected = ext not in browser.browseable_extension_blocklist
+ self.assertEqual(actual, expected)
+
# Nested tree same as in test_pyclbr.py except for supers on C0. C1.
mb = pyclbr
@@ -160,8 +170,7 @@ def test_ondoubleclick(self, fopen):
with mock.patch('os.path.exists', return_value=True):
mbt.OnDoubleClick()
- fopen.assert_called()
- fopen.called_with(fname)
+ fopen.assert_called_once_with(fname)
class ChildBrowserTreeItemTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_calltip.py b/Lib/idlelib/idle_test/test_calltip.py
index 1ccb63b9dbd65f..28c196a42672fc 100644
--- a/Lib/idlelib/idle_test/test_calltip.py
+++ b/Lib/idlelib/idle_test/test_calltip.py
@@ -7,6 +7,7 @@
import types
import re
from idlelib.idle_test.mock_tk import Text
+from test.support import MISSING_C_DOCSTRINGS
# Test Class TC is used in multiple get_argspec test methods
@@ -50,6 +51,8 @@ class Get_argspecTest(unittest.TestCase):
# but a red buildbot is better than a user crash (as has happened).
# For a simple mismatch, change the expected output to the actual.
+ @unittest.skipIf(MISSING_C_DOCSTRINGS,
+ "Signature information for builtins requires docstrings")
def test_builtins(self):
def tiptest(obj, out):
@@ -76,6 +79,7 @@ class SB: __call__ = None
tiptest(list.append, '(self, object, /)' + append_doc)
tiptest(List.append, '(self, object, /)' + append_doc)
tiptest([].append, '(object, /)' + append_doc)
+ # The use of 'object' above matches the signature text.
tiptest(types.MethodType,
'(function, instance, /)\n'
@@ -143,6 +147,8 @@ def f(): pass
f.__doc__ = 'a'*300
self.assertEqual(get_spec(f), f"()\n{'a'*(calltip._MAX_COLS-3) + '...'}")
+ @unittest.skipIf(MISSING_C_DOCSTRINGS,
+ "Signature information for builtins requires docstrings")
def test_multiline_docstring(self):
# Test fewer lines than max.
self.assertEqual(get_spec(range),
@@ -157,6 +163,7 @@ def test_multiline_docstring(self):
bytes(int) -> bytes object of size given by the parameter initialized with null bytes
bytes() -> empty bytes object''')
+ def test_multiline_docstring_2(self):
# Test more than max lines
def f(): pass
f.__doc__ = 'a\n' * 15
diff --git a/Lib/idlelib/idle_test/test_config.py b/Lib/idlelib/idle_test/test_config.py
index 697fda527968de..6d75cf7aa67dcc 100644
--- a/Lib/idlelib/idle_test/test_config.py
+++ b/Lib/idlelib/idle_test/test_config.py
@@ -85,8 +85,8 @@ def test_load_nothing(self):
self.assertEqual(parser.sections(), [])
def test_load_file(self):
- # Borrow test/cfgparser.1 from test_configparser.
- config_path = findfile('cfgparser.1')
+ # Borrow test/configdata/cfgparser.1 from test_configparser.
+ config_path = findfile('cfgparser.1', subdir='configdata')
parser = config.IdleConfParser(config_path)
parser.Load()
@@ -191,7 +191,7 @@ def setUpClass(cls):
idle_dir = os.path.abspath(sys.path[0])
for ctype in conf.config_types:
config_path = os.path.join(idle_dir, '../config-%s.def' % ctype)
- with open(config_path, 'r') as f:
+ with open(config_path) as f:
cls.config_string[ctype] = f.read()
cls.orig_warn = config._warn
@@ -274,8 +274,8 @@ def test_create_config_handlers(self):
conf.CreateConfigHandlers()
# Check keys are equal
- self.assertCountEqual(conf.defaultCfg.keys(), conf.config_types)
- self.assertCountEqual(conf.userCfg.keys(), conf.config_types)
+ self.assertCountEqual(conf.defaultCfg, conf.config_types)
+ self.assertCountEqual(conf.userCfg, conf.config_types)
# Check conf parser are correct type
for default_parser in conf.defaultCfg.values():
@@ -294,8 +294,8 @@ def test_create_config_handlers(self):
def test_load_cfg_files(self):
conf = self.new_config(_utest=True)
- # Borrow test/cfgparser.1 from test_configparser.
- config_path = findfile('cfgparser.1')
+ # Borrow test/configdata/cfgparser.1 from test_configparser.
+ config_path = findfile('cfgparser.1', subdir='configdata')
conf.defaultCfg['foo'] = config.IdleConfParser(config_path)
conf.userCfg['foo'] = config.IdleUserConfParser(config_path)
diff --git a/Lib/idlelib/idle_test/test_config_key.py b/Lib/idlelib/idle_test/test_config_key.py
index bf66cadf57cd3c..32f878b842b276 100644
--- a/Lib/idlelib/idle_test/test_config_key.py
+++ b/Lib/idlelib/idle_test/test_config_key.py
@@ -13,15 +13,13 @@
from idlelib.idle_test.mock_idle import Func
from idlelib.idle_test.mock_tk import Mbox_func
-gkd = config_key.GetKeysDialog
-
class ValidationTest(unittest.TestCase):
"Test validation methods: ok, keys_ok, bind_ok."
- class Validator(gkd):
+ class Validator(config_key.GetKeysFrame):
def __init__(self, *args, **kwargs):
- config_key.GetKeysDialog.__init__(self, *args, **kwargs)
+ super().__init__(*args, **kwargs)
class list_keys_final:
get = Func()
self.list_keys_final = list_keys_final
@@ -34,15 +32,14 @@ def setUpClass(cls):
cls.root = Tk()
cls.root.withdraw()
keylist = [[''], ['', '']]
- cls.dialog = cls.Validator(
- cls.root, 'Title', '<>', keylist, _utest=True)
+ cls.dialog = cls.Validator(cls.root, '<>', keylist)
@classmethod
def tearDownClass(cls):
- cls.dialog.cancel()
+ del cls.dialog
cls.root.update_idletasks()
cls.root.destroy()
- del cls.dialog, cls.root
+ del cls.root
def setUp(self):
self.dialog.showerror.message = ''
@@ -111,14 +108,14 @@ def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
- cls.dialog = gkd(cls.root, 'Title', '<>', [], _utest=True)
+ cls.dialog = config_key.GetKeysFrame(cls.root, '<>', [])
@classmethod
def tearDownClass(cls):
- cls.dialog.cancel()
+ del cls.dialog
cls.root.update_idletasks()
cls.root.destroy()
- del cls.dialog, cls.root
+ del cls.root
def test_toggle_level(self):
dialog = self.dialog
@@ -130,7 +127,7 @@ def stackorder():
this can be used to check whether a frame is above or
below another one.
"""
- for index, child in enumerate(dialog.frame.winfo_children()):
+ for index, child in enumerate(dialog.winfo_children()):
if child._name == 'keyseq_basic':
basic = index
if child._name == 'keyseq_advanced':
@@ -161,7 +158,7 @@ def stackorder():
class KeySelectionTest(unittest.TestCase):
"Test selecting key on Basic frames."
- class Basic(gkd):
+ class Basic(config_key.GetKeysFrame):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
class list_keys_final:
@@ -179,14 +176,14 @@ def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
- cls.dialog = cls.Basic(cls.root, 'Title', '<>', [], _utest=True)
+ cls.dialog = cls.Basic(cls.root, '<>', [])
@classmethod
def tearDownClass(cls):
- cls.dialog.cancel()
+ del cls.dialog
cls.root.update_idletasks()
cls.root.destroy()
- del cls.dialog, cls.root
+ del cls.root
def setUp(self):
self.dialog.clear_key_seq()
@@ -206,7 +203,7 @@ def test_get_modifiers(self):
dialog.modifier_checkbuttons['foo'].invoke()
eq(gm(), ['BAZ'])
- @mock.patch.object(gkd, 'get_modifiers')
+ @mock.patch.object(config_key.GetKeysFrame, 'get_modifiers')
def test_build_key_string(self, mock_modifiers):
dialog = self.dialog
key = dialog.list_keys_final
@@ -227,7 +224,7 @@ def test_build_key_string(self, mock_modifiers):
dialog.build_key_string()
eq(string(), '')
- @mock.patch.object(gkd, 'get_modifiers')
+ @mock.patch.object(config_key.GetKeysFrame, 'get_modifiers')
def test_final_key_selected(self, mock_modifiers):
dialog = self.dialog
key = dialog.list_keys_final
@@ -240,7 +237,7 @@ def test_final_key_selected(self, mock_modifiers):
eq(string(), '')
-class CancelTest(unittest.TestCase):
+class CancelWindowTest(unittest.TestCase):
"Simulate user clicking [Cancel] button."
@classmethod
@@ -248,21 +245,89 @@ def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
- cls.dialog = gkd(cls.root, 'Title', '<>', [], _utest=True)
+ cls.dialog = config_key.GetKeysWindow(
+ cls.root, 'Title', '<>', [], _utest=True)
@classmethod
def tearDownClass(cls):
cls.dialog.cancel()
+ del cls.dialog
cls.root.update_idletasks()
cls.root.destroy()
- del cls.dialog, cls.root
+ del cls.root
- def test_cancel(self):
+ @mock.patch.object(config_key.GetKeysFrame, 'ok')
+ def test_cancel(self, mock_frame_ok):
self.assertEqual(self.dialog.winfo_class(), 'Toplevel')
self.dialog.button_cancel.invoke()
with self.assertRaises(TclError):
self.dialog.winfo_class()
self.assertEqual(self.dialog.result, '')
+ mock_frame_ok.assert_not_called()
+
+
+class OKWindowTest(unittest.TestCase):
+ "Simulate user clicking [OK] button."
+
+ @classmethod
+ def setUpClass(cls):
+ requires('gui')
+ cls.root = Tk()
+ cls.root.withdraw()
+ cls.dialog = config_key.GetKeysWindow(
+ cls.root, 'Title', '<>', [], _utest=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.dialog.cancel()
+ del cls.dialog
+ cls.root.update_idletasks()
+ cls.root.destroy()
+ del cls.root
+
+ @mock.patch.object(config_key.GetKeysFrame, 'ok')
+ def test_ok(self, mock_frame_ok):
+ self.assertEqual(self.dialog.winfo_class(), 'Toplevel')
+ self.dialog.button_ok.invoke()
+ with self.assertRaises(TclError):
+ self.dialog.winfo_class()
+ mock_frame_ok.assert_called()
+
+
+class WindowResultTest(unittest.TestCase):
+ "Test window result get and set."
+
+ @classmethod
+ def setUpClass(cls):
+ requires('gui')
+ cls.root = Tk()
+ cls.root.withdraw()
+ cls.dialog = config_key.GetKeysWindow(
+ cls.root, 'Title', '<>', [], _utest=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.dialog.cancel()
+ del cls.dialog
+ cls.root.update_idletasks()
+ cls.root.destroy()
+ del cls.root
+
+ def test_result(self):
+ dialog = self.dialog
+ eq = self.assertEqual
+
+ dialog.result = ''
+ eq(dialog.result, '')
+ eq(dialog.frame.result,'')
+
+ dialog.result = 'bar'
+ eq(dialog.result,'bar')
+ eq(dialog.frame.result,'bar')
+
+ dialog.frame.result = 'foo'
+ eq(dialog.result, 'foo')
+ eq(dialog.frame.result,'foo')
class HelperTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index 3005ce08c9bf43..5099d093382445 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -420,20 +420,14 @@ def test_highlight_target_text_mouse(self):
# Set highlight_target through clicking highlight_sample.
eq = self.assertEqual
d = self.page
-
- elem = {}
- count = 0
hs = d.highlight_sample
hs.focus_force()
- hs.see(1.0)
- hs.update_idletasks()
- def tag_to_element(elem):
- for element, tag in d.theme_elements.items():
- elem[tag[0]] = element
-
- def click_it(start):
- x, y, dx, dy = hs.bbox(start)
+ def click_char(index):
+ "Simulate click on character at *index*."
+ hs.see(index)
+ hs.update_idletasks()
+ x, y, dx, dy = hs.bbox(index)
x += dx // 2
y += dy // 2
hs.event_generate('', x=0, y=0)
@@ -441,17 +435,20 @@ def click_it(start):
hs.event_generate('', x=x, y=y)
hs.event_generate('', x=x, y=y)
- # Flip theme_elements to make the tag the key.
- tag_to_element(elem)
+ # Reverse theme_elements to make the tag the key.
+ elem = {tag: element for element, tag in d.theme_elements.items()}
# If highlight_sample has a tag that isn't in theme_elements, there
# will be a KeyError in the test run.
+ count = 0
for tag in hs.tag_names():
- for start_index in hs.tag_ranges(tag)[0::2]:
- count += 1
- click_it(start_index)
+ try:
+ click_char(hs.tag_nextrange(tag, "1.0")[0])
eq(d.highlight_target.get(), elem[tag])
+ count += 1
eq(d.set_highlight_target.called, count)
+ except IndexError:
+ pass # Skip unused theme_elements tag, like 'sel'.
def test_highlight_sample_double_click(self):
# Test double click on highlight_sample.
@@ -954,8 +951,8 @@ def test_set_keys_type(self):
def test_get_new_keys(self):
eq = self.assertEqual
d = self.page
- orig_getkeysdialog = configdialog.GetKeysDialog
- gkd = configdialog.GetKeysDialog = Func(return_self=True)
+ orig_getkeysdialog = configdialog.GetKeysWindow
+ gkd = configdialog.GetKeysWindow = Func(return_self=True)
gnkn = d.get_new_keys_name = Func()
d.button_new_keys.state(('!disabled',))
@@ -997,7 +994,7 @@ def test_get_new_keys(self):
eq(d.keybinding.get(), '')
del d.get_new_keys_name
- configdialog.GetKeysDialog = orig_getkeysdialog
+ configdialog.GetKeysWindow = orig_getkeysdialog
def test_get_new_keys_name(self):
orig_sectionname = configdialog.SectionName
diff --git a/Lib/idlelib/idle_test/test_debugger.py b/Lib/idlelib/idle_test/test_debugger.py
index 35efb3411c73b5..d1c9638dd5d711 100644
--- a/Lib/idlelib/idle_test/test_debugger.py
+++ b/Lib/idlelib/idle_test/test_debugger.py
@@ -1,16 +1,286 @@
-"Test debugger, coverage 19%"
+"""Test debugger, coverage 66%
+
+Try to make tests pass with draft bdbx, which may replace bdb in 3.13+.
+"""
from idlelib import debugger
-import unittest
-from test.support import requires
-requires('gui')
+from collections import namedtuple
+from textwrap import dedent
from tkinter import Tk
+from test.support import requires
+import unittest
+from unittest import mock
+from unittest.mock import Mock, patch
+
+"""A test python script for the debug tests."""
+TEST_CODE = dedent("""
+ i = 1
+ i += 2
+ if i == 3:
+ print(i)
+ """)
+
+
+class MockFrame:
+ "Minimal mock frame."
+
+ def __init__(self, code, lineno):
+ self.f_code = code
+ self.f_lineno = lineno
+
+
+class IdbTest(unittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ cls.gui = Mock()
+ cls.idb = debugger.Idb(cls.gui)
+
+ # Create test and code objects to simulate a debug session.
+ code_obj = compile(TEST_CODE, 'idlelib/file.py', mode='exec')
+ frame1 = MockFrame(code_obj, 1)
+ frame1.f_back = None
+ frame2 = MockFrame(code_obj, 2)
+ frame2.f_back = frame1
+ cls.frame = frame2
+ cls.msg = 'file.py:2: ()'
+
+ def test_init(self):
+ self.assertIs(self.idb.gui, self.gui)
+ # Won't test super call since two Bdbs are very different.
+
+ def test_user_line(self):
+ # Test that .user_line() creates a string message for a frame.
+ self.gui.interaction = Mock()
+ self.idb.user_line(self.frame)
+ self.gui.interaction.assert_called_once_with(self.msg, self.frame)
+
+ def test_user_exception(self):
+ # Test that .user_exception() creates a string message for a frame.
+ exc_info = (type(ValueError), ValueError(), None)
+ self.gui.interaction = Mock()
+ self.idb.user_exception(self.frame, exc_info)
+ self.gui.interaction.assert_called_once_with(
+ self.msg, self.frame, exc_info)
+
+
+class FunctionTest(unittest.TestCase):
+ # Test module functions together.
+
+ def test_functions(self):
+ rpc_obj = compile(TEST_CODE,'rpc.py', mode='exec')
+ rpc_frame = MockFrame(rpc_obj, 2)
+ rpc_frame.f_back = rpc_frame
+ self.assertTrue(debugger._in_rpc_code(rpc_frame))
+ self.assertEqual(debugger._frame2message(rpc_frame),
+ 'rpc.py:2: ()')
+
+ code_obj = compile(TEST_CODE, 'idlelib/debugger.py', mode='exec')
+ code_frame = MockFrame(code_obj, 1)
+ code_frame.f_back = None
+ self.assertFalse(debugger._in_rpc_code(code_frame))
+ self.assertEqual(debugger._frame2message(code_frame),
+ 'debugger.py:1: ()')
+
+ code_frame.f_back = code_frame
+ self.assertFalse(debugger._in_rpc_code(code_frame))
+ code_frame.f_back = rpc_frame
+ self.assertTrue(debugger._in_rpc_code(code_frame))
+
+
+class DebuggerTest(unittest.TestCase):
+ "Tests for Debugger that do not need a real root."
+
+ @classmethod
+ def setUpClass(cls):
+ cls.pyshell = Mock()
+ cls.pyshell.root = Mock()
+ cls.idb = Mock()
+ with patch.object(debugger.Debugger, 'make_gui'):
+ cls.debugger = debugger.Debugger(cls.pyshell, cls.idb)
+ cls.debugger.root = Mock()
+
+ def test_cont(self):
+ self.debugger.cont()
+ self.idb.set_continue.assert_called_once()
+
+ def test_step(self):
+ self.debugger.step()
+ self.idb.set_step.assert_called_once()
+
+ def test_quit(self):
+ self.debugger.quit()
+ self.idb.set_quit.assert_called_once()
+
+ def test_next(self):
+ with patch.object(self.debugger, 'frame') as frame:
+ self.debugger.next()
+ self.idb.set_next.assert_called_once_with(frame)
+
+ def test_ret(self):
+ with patch.object(self.debugger, 'frame') as frame:
+ self.debugger.ret()
+ self.idb.set_return.assert_called_once_with(frame)
+
+ def test_clear_breakpoint(self):
+ self.debugger.clear_breakpoint('test.py', 4)
+ self.idb.clear_break.assert_called_once_with('test.py', 4)
+
+ def test_clear_file_breaks(self):
+ self.debugger.clear_file_breaks('test.py')
+ self.idb.clear_all_file_breaks.assert_called_once_with('test.py')
+
+ def test_set_load_breakpoints(self):
+ # Test the .load_breakpoints() method calls idb.
+ FileIO = namedtuple('FileIO', 'filename')
+
+ class MockEditWindow(object):
+ def __init__(self, fn, breakpoints):
+ self.io = FileIO(fn)
+ self.breakpoints = breakpoints
+
+ self.pyshell.flist = Mock()
+ self.pyshell.flist.inversedict = (
+ MockEditWindow('test1.py', [4, 4]),
+ MockEditWindow('test2.py', [13, 44, 45]),
+ )
+ self.debugger.set_breakpoint('test0.py', 1)
+ self.idb.set_break.assert_called_once_with('test0.py', 1)
+ self.debugger.load_breakpoints() # Call set_breakpoint 5 times.
+ self.idb.set_break.assert_has_calls(
+ [mock.call('test0.py', 1),
+ mock.call('test1.py', 4),
+ mock.call('test1.py', 4),
+ mock.call('test2.py', 13),
+ mock.call('test2.py', 44),
+ mock.call('test2.py', 45)])
+
+ def test_sync_source_line(self):
+ # Test that .sync_source_line() will set the flist.gotofileline with fixed frame.
+ test_code = compile(TEST_CODE, 'test_sync.py', 'exec')
+ test_frame = MockFrame(test_code, 1)
+ self.debugger.frame = test_frame
+
+ self.debugger.flist = Mock()
+ with patch('idlelib.debugger.os.path.exists', return_value=True):
+ self.debugger.sync_source_line()
+ self.debugger.flist.gotofileline.assert_called_once_with('test_sync.py', 1)
+
+
+class DebuggerGuiTest(unittest.TestCase):
+ """Tests for debugger.Debugger that need tk root.
+
+ close needs debugger.top set in make_gui.
+ """
+
+ @classmethod
+ def setUpClass(cls):
+ requires('gui')
+ cls.root = root = Tk()
+ root.withdraw()
+ cls.pyshell = Mock()
+ cls.pyshell.root = root
+ cls.idb = Mock()
+# stack tests fail with debugger here.
+## cls.debugger = debugger.Debugger(cls.pyshell, cls.idb)
+## cls.debugger.root = root
+## # real root needed for real make_gui
+## # run, interacting, abort_loop
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.root.destroy()
+ del cls.root
+
+ def setUp(self):
+ self.debugger = debugger.Debugger(self.pyshell, self.idb)
+ self.debugger.root = self.root
+ # real root needed for real make_gui
+ # run, interacting, abort_loop
+
+ def test_run_debugger(self):
+ self.debugger.run(1, 'two')
+ self.idb.run.assert_called_once_with(1, 'two')
+ self.assertEqual(self.debugger.interacting, 0)
+
+ def test_close(self):
+ # Test closing the window in an idle state.
+ self.debugger.close()
+ self.pyshell.close_debugger.assert_called_once()
+
+ def test_show_stack(self):
+ self.debugger.show_stack()
+ self.assertEqual(self.debugger.stackviewer.gui, self.debugger)
+
+ def test_show_stack_with_frame(self):
+ test_frame = MockFrame(None, None)
+ self.debugger.frame = test_frame
+
+ # Reset the stackviewer to force it to be recreated.
+ self.debugger.stackviewer = None
+ self.idb.get_stack.return_value = ([], 0)
+ self.debugger.show_stack()
+
+ # Check that the newly created stackviewer has the test gui as a field.
+ self.assertEqual(self.debugger.stackviewer.gui, self.debugger)
+ self.idb.get_stack.assert_called_once_with(test_frame, None)
+
+
+class StackViewerTest(unittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ requires('gui')
+ cls.root = Tk()
+ cls.root.withdraw()
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.root.destroy()
+ del cls.root
+
+ def setUp(self):
+ self.code = compile(TEST_CODE, 'test_stackviewer.py', 'exec')
+ self.stack = [
+ (MockFrame(self.code, 1), 1),
+ (MockFrame(self.code, 2), 2)
+ ]
+ # Create a stackviewer and load the test stack.
+ self.sv = debugger.StackViewer(self.root, None, None)
+ self.sv.load_stack(self.stack)
+
+ def test_init(self):
+ # Test creation of StackViewer.
+ gui = None
+ flist = None
+ master_window = self.root
+ sv = debugger.StackViewer(master_window, flist, gui)
+ self.assertTrue(hasattr(sv, 'stack'))
+
+ def test_load_stack(self):
+ # Test the .load_stack() method against a fixed test stack.
+ # Check the test stack is assigned and the list contains the repr of them.
+ self.assertEqual(self.sv.stack, self.stack)
+ self.assertTrue('?.(), line 1:' in self.sv.get(0))
+ self.assertEqual(self.sv.get(1), '?.(), line 2: ')
+
+ def test_show_source(self):
+ # Test the .show_source() method against a fixed test stack.
+ # Patch out the file list to monitor it
+ self.sv.flist = Mock()
+ # Patch out isfile to pretend file exists.
+ with patch('idlelib.debugger.os.path.isfile', return_value=True) as isfile:
+ self.sv.show_source(1)
+ isfile.assert_called_once_with('test_stackviewer.py')
+ self.sv.flist.open.assert_called_once_with('test_stackviewer.py')
+
class NameSpaceTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
+ requires('gui')
cls.root = Tk()
cls.root.withdraw()
@@ -23,7 +293,5 @@ def test_init(self):
debugger.NamespaceViewer(self.root, 'Test')
-# Other classes are Idb, Debugger, and StackViewer.
-
if __name__ == '__main__':
unittest.main(verbosity=2)
diff --git a/Lib/idlelib/idle_test/test_debugger_r.py b/Lib/idlelib/idle_test/test_debugger_r.py
index 638ebd36a7405d..cf8af05fe27e77 100644
--- a/Lib/idlelib/idle_test/test_debugger_r.py
+++ b/Lib/idlelib/idle_test/test_debugger_r.py
@@ -2,28 +2,21 @@
from idlelib import debugger_r
import unittest
-from test.support import requires
-from tkinter import Tk
-
-
-class Test(unittest.TestCase):
+# Boilerplate likely to be needed for future test classes.
+##from test.support import requires
+##from tkinter import Tk
+##class Test(unittest.TestCase):
## @classmethod
## def setUpClass(cls):
## requires('gui')
## cls.root = Tk()
-##
## @classmethod
## def tearDownClass(cls):
## cls.root.destroy()
-## del cls.root
-
- def test_init(self):
- self.assertTrue(True) # Get coverage of import
-
-# Classes GUIProxy, IdbAdapter, FrameProxy, CodeProxy, DictProxy,
-# GUIAdapter, IdbProxy plus 7 module functions.
+# GUIProxy, IdbAdapter, FrameProxy, CodeProxy, DictProxy,
+# GUIAdapter, IdbProxy, and 7 functions still need tests.
class IdbAdapterTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_debugobj.py b/Lib/idlelib/idle_test/test_debugobj.py
index 131ce22b8bb69b..90ace4e1bc4f9e 100644
--- a/Lib/idlelib/idle_test/test_debugobj.py
+++ b/Lib/idlelib/idle_test/test_debugobj.py
@@ -37,7 +37,7 @@ def test_isexpandable(self):
def test_keys(self):
ti = debugobj.SequenceTreeItem('label', 'abc')
- self.assertEqual(list(ti.keys()), [0, 1, 2])
+ self.assertEqual(list(ti.keys()), [0, 1, 2]) # keys() is a range.
class DictTreeItemTest(unittest.TestCase):
@@ -50,7 +50,7 @@ def test_isexpandable(self):
def test_keys(self):
ti = debugobj.DictTreeItem('label', {1:1, 0:0, 2:2})
- self.assertEqual(ti.keys(), [0, 1, 2])
+ self.assertEqual(ti.keys(), [0, 1, 2]) # keys() is a sorted list.
if __name__ == '__main__':
diff --git a/Lib/idlelib/idle_test/test_editor.py b/Lib/idlelib/idle_test/test_editor.py
index 8665d680c0118f..0dfe2f3c58befa 100644
--- a/Lib/idlelib/idle_test/test_editor.py
+++ b/Lib/idlelib/idle_test/test_editor.py
@@ -1,11 +1,10 @@
-"Test editor, coverage 35%."
+"Test editor, coverage 53%."
from idlelib import editor
import unittest
from collections import namedtuple
from test.support import requires
-from tkinter import Tk
-from idlelib.idle_test.mock_idle import Func
+from tkinter import Tk, Text
Editor = editor.EditorWindow
@@ -32,7 +31,7 @@ def test_init(self):
e._close()
-class TestGetLineIndent(unittest.TestCase):
+class GetLineIndentTest(unittest.TestCase):
def test_empty_lines(self):
for tabwidth in [1, 2, 4, 6, 8]:
for line in ['', '\n']:
@@ -96,7 +95,7 @@ def test_tabwidth_8(self):
def insert(text, string):
text.delete('1.0', 'end')
text.insert('end', string)
- text.update() # Force update for colorizer to finish.
+ text.update_idletasks() # Force update for colorizer to finish.
class IndentAndNewlineTest(unittest.TestCase):
@@ -182,6 +181,36 @@ def test_indent_and_newline_event(self):
eq(get('1.0', 'end'), ' def f1(self, a,\n \n return a + b\n')
+class IndentSearcherTest(unittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ requires('gui')
+ cls.root = Tk()
+ cls.root.withdraw()
+ cls.text = Text(cls.root)
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.root.destroy()
+ del cls.root
+
+ def test_searcher(self):
+ text = self.text
+ searcher = (self.text)
+ test_info = (# text, (block, indent))
+ ("", (None, None)),
+ ("[1,", (None, None)), # TokenError
+ ("if 1:\n", ('if 1:\n', None)),
+ ("if 1:\n 2\n 3\n", ('if 1:\n', ' 2\n')),
+ )
+ for code, expected_pair in test_info:
+ with self.subTest(code=code):
+ insert(text, code)
+ actual_pair = editor.IndentSearcher(text).run()
+ self.assertEqual(actual_pair, expected_pair)
+
+
class RMenuTest(unittest.TestCase):
@classmethod
diff --git a/Lib/idlelib/idle_test/test_help.py b/Lib/idlelib/idle_test/test_help.py
index b542659981894d..c528d4e77f8ca7 100644
--- a/Lib/idlelib/idle_test/test_help.py
+++ b/Lib/idlelib/idle_test/test_help.py
@@ -1,4 +1,4 @@
-"Test help, coverage 87%."
+"Test help, coverage 94%."
from idlelib import help
import unittest
@@ -8,25 +8,27 @@
from tkinter import Tk
-class HelpFrameTest(unittest.TestCase):
+class IdleDocTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
"By itself, this tests that file parsed without exception."
cls.root = root = Tk()
root.withdraw()
- helpfile = join(dirname(dirname(abspath(__file__))), 'help.html')
- cls.frame = help.HelpFrame(root, helpfile)
+ cls.window = help.show_idlehelp(root)
@classmethod
def tearDownClass(cls):
- del cls.frame
+ del cls.window
cls.root.update_idletasks()
cls.root.destroy()
del cls.root
- def test_line1(self):
- text = self.frame.text
+ def test_1window(self):
+ self.assertIn('IDLE Doc', self.window.wm_title())
+
+ def test_4text(self):
+ text = self.window.frame.text
self.assertEqual(text.get('1.0', '1.end'), ' IDLE ')
diff --git a/Lib/idlelib/idle_test/test_help_about.py b/Lib/idlelib/idle_test/test_help_about.py
index b915535acac0cc..7e16abdb7c9f96 100644
--- a/Lib/idlelib/idle_test/test_help_about.py
+++ b/Lib/idlelib/idle_test/test_help_about.py
@@ -36,7 +36,7 @@ def tearDownClass(cls):
del cls.root
def test_build_bits(self):
- self.assertIn(help_about.build_bits(), ('32', '64'))
+ self.assertIn(help_about.bits, ('32', '64'))
def test_dialog_title(self):
"""Test about dialog title"""
@@ -71,7 +71,7 @@ def test_file_buttons(self):
"""Test buttons that display files."""
dialog = self.dialog
button_sources = [(self.dialog.readme, 'README.txt', 'readme'),
- (self.dialog.idle_news, 'NEWS.txt', 'news'),
+ (self.dialog.idle_news, 'News3.txt', 'news'),
(self.dialog.idle_credits, 'CREDITS.txt', 'credits')]
for button, filename, name in button_sources:
@@ -107,7 +107,7 @@ def test_dialog_title(self):
"""Test about dialog title"""
self.assertEqual(self.dialog.title(),
f'About IDLE {python_version()}'
- f' ({help_about.build_bits()} bit)')
+ f' ({help_about.bits} bit)')
class CloseTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_iomenu.py b/Lib/idlelib/idle_test/test_iomenu.py
index e338893c09e6a1..e0642cf0cabef0 100644
--- a/Lib/idlelib/idle_test/test_iomenu.py
+++ b/Lib/idlelib/idle_test/test_iomenu.py
@@ -1,10 +1,18 @@
"Test , coverage 17%."
-from idlelib import iomenu, util
+from idlelib import iomenu
import unittest
from test.support import requires
from tkinter import Tk
from idlelib.editor import EditorWindow
+from idlelib import util
+from idlelib.idle_test.mock_idle import Func
+
+# Fail if either tokenize.open and t.detect_encoding does not exist.
+# These are used in loadfile and encode.
+# Also used in pyshell.MI.execfile and runscript.tabnanny.
+from tokenize import open, detect_encoding
+# Remove when we have proper tests that use both.
class IOBindingTest(unittest.TestCase):
@@ -36,9 +44,14 @@ def test_fixnewlines_end(self):
io = self.io
fix = io.fixnewlines
text = io.editwin.text
+
+ # Make the editor temporarily look like Shell.
self.editwin.interp = None
- eq(fix(), '')
- del self.editwin.interp
+ shelltext = '>>> if 1'
+ self.editwin.get_prompt_text = Func(result=shelltext)
+ eq(fix(), shelltext) # Get... call and '\n' not added.
+ del self.editwin.interp, self.editwin.get_prompt_text
+
text.insert(1.0, 'a')
eq(fix(), 'a'+io.eol_convention)
eq(text.get('1.0', 'end-1c'), 'a\n')
diff --git a/Lib/idlelib/idle_test/test_outwin.py b/Lib/idlelib/idle_test/test_outwin.py
index e347bfca7f191a..d6e85ad674417c 100644
--- a/Lib/idlelib/idle_test/test_outwin.py
+++ b/Lib/idlelib/idle_test/test_outwin.py
@@ -159,7 +159,7 @@ def test_file_line_helper(self, mock_open):
for line, expected_output in test_lines:
self.assertEqual(flh(line), expected_output)
if expected_output:
- mock_open.assert_called_with(expected_output[0], 'r')
+ mock_open.assert_called_with(expected_output[0])
if __name__ == '__main__':
diff --git a/Lib/idlelib/idle_test/test_parenmatch.py b/Lib/idlelib/idle_test/test_parenmatch.py
index 4a41d8433d5483..2e10d7cd36760f 100644
--- a/Lib/idlelib/idle_test/test_parenmatch.py
+++ b/Lib/idlelib/idle_test/test_parenmatch.py
@@ -83,12 +83,12 @@ def test_paren_corner(self):
"""
Test corner cases in flash_paren_event and paren_closed_event.
- These cases force conditional expression and alternate paths.
+ Force execution of conditional expressions and alternate paths.
"""
text = self.text
pm = self.get_parenmatch()
- text.insert('insert', '# this is a commen)')
+ text.insert('insert', '# Comment.)')
pm.paren_closed_event('event')
text.insert('insert', '\ndef')
diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index d859ffc153fcdd..ec4637c5ca617a 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -3,7 +3,7 @@
from idlelib import run
import io
import sys
-from test.support import captured_output, captured_stderr, has_no_debug_ranges
+from test.support import captured_output, captured_stderr
import unittest
from unittest import mock
import idlelib
@@ -33,14 +33,9 @@ def __eq__(self, other):
run.print_exception()
tb = output.getvalue().strip().splitlines()
- if has_no_debug_ranges():
- self.assertEqual(11, len(tb))
- self.assertIn('UnhashableException: ex2', tb[3])
- self.assertIn('UnhashableException: ex1', tb[10])
- else:
- self.assertEqual(13, len(tb))
- self.assertIn('UnhashableException: ex2', tb[4])
- self.assertIn('UnhashableException: ex1', tb[12])
+ self.assertEqual(11, len(tb))
+ self.assertIn('UnhashableException: ex2', tb[3])
+ self.assertIn('UnhashableException: ex1', tb[10])
data = (('1/0', ZeroDivisionError, "division by zero\n"),
('abc', NameError, "name 'abc' is not defined. "
diff --git a/Lib/idlelib/idle_test/test_sidebar.py b/Lib/idlelib/idle_test/test_sidebar.py
index 01fd6a04d0de30..605e7a892570d7 100644
--- a/Lib/idlelib/idle_test/test_sidebar.py
+++ b/Lib/idlelib/idle_test/test_sidebar.py
@@ -6,6 +6,7 @@
import unittest
import unittest.mock
from test.support import requires, swap_attr
+from test import support
import tkinter as tk
from idlelib.idle_test.tkinter_testing_utils import run_in_tk_mainloop
@@ -56,7 +57,7 @@ def setUpClass(cls):
@classmethod
def tearDownClass(cls):
cls.editwin.per.close()
- cls.root.update()
+ cls.root.update_idletasks()
cls.root.destroy()
del cls.text, cls.text_frame, cls.editwin, cls.root
@@ -327,7 +328,7 @@ def test_scroll(self):
self.assertEqual(self.linenumber.sidebar_text.index('@0,0'), '11.0')
# Generate a mouse-wheel event and make sure it scrolled up or down.
- # The meaning of the "delta" is OS-dependant, so this just checks for
+ # The meaning of the "delta" is OS-dependent, so this just checks for
# any change.
self.linenumber.sidebar_text.event_generate('',
x=0, y=0,
@@ -612,7 +613,8 @@ def test_interrupt_recall_undo_redo(self):
@run_in_tk_mainloop()
def test_very_long_wrapped_line(self):
- with swap_attr(self.shell, 'squeezer', None):
+ with support.adjust_int_max_str_digits(11_111), \
+ swap_attr(self.shell, 'squeezer', None):
self.do_input('x = ' + '1'*10_000 + '\n')
yield
self.assertEqual(self.get_sidebar_lines(), ['>>>'])
@@ -688,15 +690,22 @@ def test_mousewheel(self):
last_lineno = get_end_linenumber(text)
self.assertIsNotNone(text.dlineinfo(text.index(f'{last_lineno}.0')))
- # Scroll up using the event.
- # The meaning delta is platform-dependant.
- delta = -1 if sys.platform == 'darwin' else 120
- sidebar.canvas.event_generate('', x=0, y=0, delta=delta)
+ # Delta for , whose meaning is platform-dependent.
+ delta = 1 if sidebar.canvas._windowingsystem == 'aqua' else 120
+
+ # Scroll up.
+ if sidebar.canvas._windowingsystem == 'x11':
+ sidebar.canvas.event_generate('', x=0, y=0)
+ else:
+ sidebar.canvas.event_generate('', x=0, y=0, delta=delta)
yield
self.assertIsNone(text.dlineinfo(text.index(f'{last_lineno}.0')))
- # Scroll back down using the event.
- sidebar.canvas.event_generate('', x=0, y=0)
+ # Scroll back down.
+ if sidebar.canvas._windowingsystem == 'x11':
+ sidebar.canvas.event_generate('', x=0, y=0)
+ else:
+ sidebar.canvas.event_generate('', x=0, y=0, delta=-delta)
yield
self.assertIsNotNone(text.dlineinfo(text.index(f'{last_lineno}.0')))
@@ -733,7 +742,7 @@ def test_copy_with_prompts(self):
first_line = get_end_linenumber(text)
self.do_input(dedent('''\
if True:
- print(1)
+ print(1)
'''))
yield
@@ -744,9 +753,10 @@ def test_copy_with_prompts(self):
selected_lines_text = text.get('sel.first linestart', 'sel.last')
selected_lines = selected_lines_text.split('\n')
- # Expect a block of input, a single output line, and a new prompt
+ selected_lines.pop() # Final '' is a split artifact, not a line.
+ # Expect a block of input and a single output line.
expected_prompts = \
- ['>>>'] + ['...'] * (len(selected_lines) - 3) + [None, '>>>']
+ ['>>>'] + ['...'] * (len(selected_lines) - 2) + [None]
selected_text_with_prompts = '\n'.join(
line if prompt is None else prompt + ' ' + line
for prompt, line in zip(expected_prompts,
diff --git a/Lib/idlelib/idle_test/test_stackviewer.py b/Lib/idlelib/idle_test/test_stackviewer.py
index 98f53f9537bb25..55f510382bf4c3 100644
--- a/Lib/idlelib/idle_test/test_stackviewer.py
+++ b/Lib/idlelib/idle_test/test_stackviewer.py
@@ -6,19 +6,12 @@
from tkinter import Tk
from idlelib.tree import TreeNode, ScrolledCanvas
-import sys
class StackBrowserTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
- svs = stackviewer.sys
- try:
- abc
- except NameError:
- svs.last_type, svs.last_value, svs.last_traceback = (
- sys.exc_info())
requires('gui')
cls.root = Tk()
@@ -26,8 +19,6 @@ def setUpClass(cls):
@classmethod
def tearDownClass(cls):
- svs = stackviewer.sys
- del svs.last_traceback, svs.last_type, svs.last_value
cls.root.update_idletasks()
## for id in cls.root.tk.call('after', 'info'):
@@ -36,7 +27,10 @@ def tearDownClass(cls):
del cls.root
def test_init(self):
- sb = stackviewer.StackBrowser(self.root)
+ try:
+ abc
+ except NameError as exc:
+ sb = stackviewer.StackBrowser(self.root, exc)
isi = self.assertIsInstance
isi(stackviewer.sc, ScrolledCanvas)
isi(stackviewer.item, stackviewer.StackTreeItem)
diff --git a/Lib/idlelib/idle_test/test_text.py b/Lib/idlelib/idle_test/test_text.py
index 0f31179e04b28f..43a9ba02c3d3c9 100644
--- a/Lib/idlelib/idle_test/test_text.py
+++ b/Lib/idlelib/idle_test/test_text.py
@@ -6,7 +6,7 @@
from test.support import requires
from _tkinter import TclError
-class TextTest(object):
+class TextTest:
"Define items common to both sets of tests."
hw = 'hello\nworld' # Several tests insert this after initialization.
diff --git a/Lib/idlelib/idle_test/test_zzdummy.py b/Lib/idlelib/idle_test/test_zzdummy.py
index 1013cdc3c46f4f..209d8564da0664 100644
--- a/Lib/idlelib/idle_test/test_zzdummy.py
+++ b/Lib/idlelib/idle_test/test_zzdummy.py
@@ -19,7 +19,7 @@
}
code_sample = """\
-class C1():
+class C1:
# Class comment.
def __init__(self, a, b):
self.a = a
diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py
index ad3109df84096a..464126e2df0668 100644
--- a/Lib/idlelib/iomenu.py
+++ b/Lib/idlelib/iomenu.py
@@ -7,20 +7,14 @@
from tkinter import filedialog
from tkinter import messagebox
-from tkinter.simpledialog import askstring
+from tkinter.simpledialog import askstring # loadfile encoding.
-import idlelib
from idlelib.config import idleConf
from idlelib.util import py_extensions
py_extensions = ' '.join("*"+ext for ext in py_extensions)
-
encoding = 'utf-8'
-if sys.platform == 'win32':
- errors = 'surrogatepass'
-else:
- errors = 'surrogateescape'
-
+errors = 'surrogatepass' if sys.platform == 'win32' else 'surrogateescape'
class IOBinding:
@@ -186,24 +180,25 @@ def loadfile(self, filename):
return True
def maybesave(self):
+ """Return 'yes', 'no', 'cancel' as appropriate.
+
+ Tkinter messagebox.askyesnocancel converts these tk responses
+ to True, False, None. Convert back, as now expected elsewhere.
+ """
if self.get_saved():
return "yes"
- message = "Do you want to save %s before closing?" % (
- self.filename or "this untitled document")
+ message = ("Do you want to save "
+ f"{self.filename or 'this untitled document'}"
+ " before closing?")
confirm = messagebox.askyesnocancel(
title="Save On Close",
message=message,
default=messagebox.YES,
parent=self.text)
if confirm:
- reply = "yes"
self.save(None)
- if not self.get_saved():
- reply = "cancel"
- elif confirm is None:
- reply = "cancel"
- else:
- reply = "no"
+ reply = "yes" if self.get_saved() else "cancel"
+ else: reply = "cancel" if confirm is None else "no"
self.text.focus_set()
return reply
@@ -257,11 +252,17 @@ def writefile(self, filename):
return False
def fixnewlines(self):
- "Return text with final \n if needed and os eols."
- if (self.text.get("end-2c") != '\n'
- and not hasattr(self.editwin, "interp")): # Not shell.
- self.text.insert("end-1c", "\n")
- text = self.text.get("1.0", "end-1c")
+ """Return text with os eols.
+
+ Add prompts if shell else final \n if missing.
+ """
+
+ if hasattr(self.editwin, "interp"): # Saving shell.
+ text = self.editwin.get_prompt_text('1.0', self.text.index('end-1c'))
+ else:
+ if self.text.get("end-2c") != '\n':
+ self.text.insert("end-1c", "\n") # Changes 'end-1c' value.
+ text = self.text.get('1.0', "end-1c")
if self.eol_convention != "\n":
text = text.replace("\n", self.eol_convention)
return text
@@ -393,13 +394,15 @@ def updaterecentfileslist(self,filename):
if self.editwin.flist:
self.editwin.update_recent_files_list(filename)
+
def _io_binding(parent): # htest #
from tkinter import Toplevel, Text
- root = Toplevel(parent)
- root.title("Test IOBinding")
+ top = Toplevel(parent)
+ top.title("Test IOBinding")
x, y = map(int, parent.geometry().split('+')[1:])
- root.geometry("+%d+%d" % (x, y + 175))
+ top.geometry("+%d+%d" % (x, y + 175))
+
class MyEditWin:
def __init__(self, text):
self.text = text
@@ -423,12 +426,13 @@ def saveas(self, event):
def savecopy(self, event):
self.text.event_generate("<>")
- text = Text(root)
+ text = Text(top)
text.pack()
text.focus_set()
editwin = MyEditWin(text)
IOBinding(editwin)
+
if __name__ == "__main__":
from unittest import main
main('idlelib.idle_test.test_iomenu', verbosity=2, exit=False)
diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py
index 53848fb079eab1..086bfa36512960 100644
--- a/Lib/idlelib/macosx.py
+++ b/Lib/idlelib/macosx.py
@@ -14,12 +14,25 @@
_tk_type = None
def _init_tk_type():
- """
- Initializes OS X Tk variant values for
- isAquaTk(), isCarbonTk(), isCocoaTk(), and isXQuartz().
+ """ Initialize _tk_type for isXyzTk functions.
+
+ This function is only called once, when _tk_type is still None.
"""
global _tk_type
if platform == 'darwin':
+
+ # When running IDLE, GUI is present, test/* may not be.
+ # When running tests, test/* is present, GUI may not be.
+ # If not, guess most common. Does not matter for testing.
+ from idlelib.__init__ import testing
+ if testing:
+ from test.support import requires, ResourceDenied
+ try:
+ requires('gui')
+ except ResourceDenied:
+ _tk_type = "cocoa"
+ return
+
root = tkinter.Tk()
ws = root.tk.call('tk', 'windowingsystem')
if 'x11' in ws:
@@ -33,6 +46,7 @@ def _init_tk_type():
root.destroy()
else:
_tk_type = "other"
+ return
def isAquaTk():
"""
@@ -208,7 +222,7 @@ def help_dialog(event=None):
# The binding above doesn't reliably work on all versions of Tk
# on macOS. Adding command definition below does seem to do the
# right thing for now.
- root.createcommand('exit', flist.close_all_callback)
+ root.createcommand('::tk::mac::Quit', flist.close_all_callback)
if isCarbonTk():
# for Carbon AquaTk, replace the default Tk apple menu
diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py
index a1b169176cba92..91a32cebb513f9 100644
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -42,16 +42,17 @@
('_Undo', '<>'),
('_Redo', '<>'),
None,
+ ('Select _All', '<>'),
('Cu_t', '<>'),
('_Copy', '<>'),
('_Paste', '<>'),
- ('Select _All', '<>'),
None,
('_Find...', '<>'),
('Find A_gain', '<>'),
('Find _Selection', '<>'),
('Find in Files...', '<>'),
('R_eplace...', '<>'),
+ None,
('Go to _Line', '<>'),
('S_how Completions', '<>'),
('E_xpand Word', '<>'),
@@ -110,7 +111,7 @@
('help', [
('_About IDLE', '<>'),
None,
- ('_IDLE Help', '<>'),
+ ('_IDLE Doc', '<>'),
('Python _Docs', '<>'),
]),
]
diff --git a/Lib/idlelib/multicall.py b/Lib/idlelib/multicall.py
index dc02001292fc14..41f81813113062 100644
--- a/Lib/idlelib/multicall.py
+++ b/Lib/idlelib/multicall.py
@@ -52,9 +52,9 @@
_modifier_masks = (MC_CONTROL, MC_ALT, MC_SHIFT, MC_META)
# a dictionary to map a modifier name into its number
-_modifier_names = dict([(name, number)
+_modifier_names = {name: number
for number in range(len(_modifiers))
- for name in _modifiers[number]])
+ for name in _modifiers[number]}
# In 3.4, if no shell window is ever open, the underlying Tk widget is
# destroyed before .__del__ methods here are called. The following
@@ -134,7 +134,7 @@ def nbits(n):
return nb
statelist = []
for state in states:
- substates = list(set(state & x for x in states))
+ substates = list({state & x for x in states})
substates.sort(key=nbits, reverse=True)
statelist.append(substates)
return statelist
@@ -258,9 +258,9 @@ def __del__(self):
_binder_classes = (_ComplexBinder,) * 4 + (_SimpleBinder,) * (len(_types)-4)
# A dictionary to map a type name into its number
-_type_names = dict([(name, number)
+_type_names = {name: number
for number in range(len(_types))
- for name in _types[number]])
+ for name in _types[number]}
_keysym_re = re.compile(r"^\w+$")
_button_re = re.compile(r"^[1-5]$")
@@ -421,6 +421,8 @@ def _multi_call(parent): # htest #
top.geometry("+%d+%d" % (x, y + 175))
text = MultiCallCreator(tkinter.Text)(top)
text.pack()
+ text.focus_set()
+
def bindseq(seq, n=[0]):
def handler(event):
print(seq)
@@ -440,6 +442,7 @@ def handler(event):
bindseq("")
bindseq("")
+
if __name__ == "__main__":
from unittest import main
main('idlelib.idle_test.test_mainmenu', verbosity=2, exit=False)
diff --git a/Lib/idlelib/outwin.py b/Lib/idlelib/outwin.py
index 5ab08bbaf4bc95..5ed3f35a7af655 100644
--- a/Lib/idlelib/outwin.py
+++ b/Lib/idlelib/outwin.py
@@ -42,7 +42,7 @@ def file_line_helper(line):
if match:
filename, lineno = match.group(1, 2)
try:
- f = open(filename, "r")
+ f = open(filename)
f.close()
break
except OSError:
@@ -112,7 +112,7 @@ def write(self, s, tags=(), mark="insert"):
assert isinstance(s, str)
self.text.insert(mark, s, tags)
self.text.see(mark)
- self.text.update()
+ self.text.update_idletasks()
return len(s)
def writelines(self, lines):
@@ -182,6 +182,7 @@ def setup(self):
text.tag_raise('sel')
self.write = self.owin.write
+
if __name__ == '__main__':
from unittest import main
main('idlelib.idle_test.test_outwin', verbosity=2, exit=False)
diff --git a/Lib/idlelib/pathbrowser.py b/Lib/idlelib/pathbrowser.py
index 6de242d0000bed..48a77875ba5801 100644
--- a/Lib/idlelib/pathbrowser.py
+++ b/Lib/idlelib/pathbrowser.py
@@ -99,13 +99,9 @@ def listmodules(self, allnames):
return sorted
-def _path_browser(parent): # htest #
- PathBrowser(parent, _htest=True)
- parent.mainloop()
-
if __name__ == "__main__":
from unittest import main
main('idlelib.idle_test.test_pathbrowser', verbosity=2, exit=False)
from idlelib.idle_test.htest import run
- run(_path_browser)
+ run(PathBrowser)
diff --git a/Lib/idlelib/percolator.py b/Lib/idlelib/percolator.py
index 1fe34d29f54eb2..aa73427c4915c8 100644
--- a/Lib/idlelib/percolator.py
+++ b/Lib/idlelib/percolator.py
@@ -86,11 +86,11 @@ def delete(self, *args):
print(self.name, ": delete", args)
self.delegate.delete(*args)
- box = tk.Toplevel(parent)
- box.title("Test Percolator")
+ top = tk.Toplevel(parent)
+ top.title("Test Percolator")
x, y = map(int, parent.geometry().split('+')[1:])
- box.geometry("+%d+%d" % (x, y + 175))
- text = tk.Text(box)
+ top.geometry("+%d+%d" % (x, y + 175))
+ text = tk.Text(top)
p = Percolator(text)
pin = p.insertfilter
pout = p.removefilter
@@ -103,13 +103,15 @@ def toggle2():
(pin if var2.get() else pout)(t2)
text.pack()
+ text.focus_set()
var1 = tk.IntVar(parent)
- cb1 = tk.Checkbutton(box, text="Tracer1", command=toggle1, variable=var1)
+ cb1 = tk.Checkbutton(top, text="Tracer1", command=toggle1, variable=var1)
cb1.pack()
var2 = tk.IntVar(parent)
- cb2 = tk.Checkbutton(box, text="Tracer2", command=toggle2, variable=var2)
+ cb2 = tk.Checkbutton(top, text="Tracer2", command=toggle2, variable=var2)
cb2.pack()
+
if __name__ == "__main__":
from unittest import main
main('idlelib.idle_test.test_percolator', verbosity=2, exit=False)
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 2e54a81a1d38dd..037d6a352ff162 100755
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -133,8 +133,8 @@ class PyShellEditorWindow(EditorWindow):
def __init__(self, *args):
self.breakpoints = []
EditorWindow.__init__(self, *args)
- self.text.bind("<>", self.set_breakpoint_here)
- self.text.bind("<>", self.clear_breakpoint_here)
+ self.text.bind("<>", self.set_breakpoint_event)
+ self.text.bind("<>", self.clear_breakpoint_event)
self.text.bind("<>", self.flist.open_shell)
#TODO: don't read/write this from/to .idlerc when testing
@@ -155,8 +155,8 @@ def filename_changed_hook(old_hook=self.io.filename_change_hook,
("Copy", "<>", "rmenu_check_copy"),
("Paste", "<>", "rmenu_check_paste"),
(None, None, None),
- ("Set Breakpoint", "<>", None),
- ("Clear Breakpoint", "<>", None)
+ ("Set Breakpoint", "<>", None),
+ ("Clear Breakpoint", "<>", None)
]
def color_breakpoint_text(self, color=True):
@@ -181,11 +181,11 @@ def set_breakpoint(self, lineno):
self.breakpoints.append(lineno)
try: # update the subprocess debugger
debug = self.flist.pyshell.interp.debugger
- debug.set_breakpoint_here(filename, lineno)
+ debug.set_breakpoint(filename, lineno)
except: # but debugger may not be active right now....
pass
- def set_breakpoint_here(self, event=None):
+ def set_breakpoint_event(self, event=None):
text = self.text
filename = self.io.filename
if not filename:
@@ -194,7 +194,7 @@ def set_breakpoint_here(self, event=None):
lineno = int(float(text.index("insert")))
self.set_breakpoint(lineno)
- def clear_breakpoint_here(self, event=None):
+ def clear_breakpoint_event(self, event=None):
text = self.text
filename = self.io.filename
if not filename:
@@ -209,7 +209,7 @@ def clear_breakpoint_here(self, event=None):
"insert lineend +1char")
try:
debug = self.flist.pyshell.interp.debugger
- debug.clear_breakpoint_here(filename, lineno)
+ debug.clear_breakpoint(filename, lineno)
except:
pass
@@ -249,7 +249,7 @@ def store_file_breaks(self):
breaks = self.breakpoints
filename = self.io.filename
try:
- with open(self.breakpointPath, "r") as fp:
+ with open(self.breakpointPath) as fp:
lines = fp.readlines()
except OSError:
lines = []
@@ -279,7 +279,7 @@ def restore_file_breaks(self):
if filename is None:
return
if os.path.isfile(self.breakpointPath):
- with open(self.breakpointPath, "r") as fp:
+ with open(self.breakpointPath) as fp:
lines = fp.readlines()
for line in lines:
if line.startswith(filename + '='):
@@ -441,7 +441,7 @@ def build_subprocess_arglist(self):
# run from the IDLE source directory.
del_exitf = idleConf.GetOption('main', 'General', 'delete-exitfunc',
default=False, type='bool')
- command = "__import__('idlelib.run').run.main(%r)" % (del_exitf,)
+ command = f"__import__('idlelib.run').run.main({del_exitf!r})"
return [sys.executable] + w + ["-c", command, str(self.port)]
def start_subprocess(self):
@@ -574,9 +574,9 @@ def transfer_path(self, with_cwd=False):
self.runcommand("""if 1:
import sys as _sys
- _sys.path = %r
+ _sys.path = {!r}
del _sys
- \n""" % (path,))
+ \n""".format(path))
active_seq = None
@@ -703,14 +703,14 @@ def stuffsource(self, source):
def prepend_syspath(self, filename):
"Prepend sys.path with file's directory if not already included"
self.runcommand("""if 1:
- _filename = %r
+ _filename = {!r}
import sys as _sys
from os.path import dirname as _dirname
_dir = _dirname(_filename)
if not _dir in _sys.path:
_sys.path.insert(0, _dir)
del _filename, _sys, _dirname, _dir
- \n""" % (filename,))
+ \n""".format(filename))
def showsyntaxerror(self, filename=None):
"""Override Interactive Interpreter method: Use Colorizing
@@ -747,10 +747,11 @@ def showtraceback(self):
self.tkconsole.open_stack_viewer()
def checklinecache(self):
- c = linecache.cache
- for key in list(c.keys()):
+ "Remove keys other than ''."
+ cache = linecache.cache
+ for key in list(cache): # Iterate list because mutate cache.
if key[:1] + key[-1:] != "<>":
- del c[key]
+ del cache[key]
def runcommand(self, code):
"Run the code without invoking the debugger"
@@ -986,6 +987,23 @@ def replace_event(self, event):
def get_standard_extension_names(self):
return idleConf.GetExtensions(shell_only=True)
+ def get_prompt_text(self, first, last):
+ """Return text between first and last with prompts added."""
+ text = self.text.get(first, last)
+ lineno_range = range(
+ int(float(first)),
+ int(float(last))
+ )
+ prompts = [
+ self.shell_sidebar.line_prompts.get(lineno)
+ for lineno in lineno_range
+ ]
+ return "\n".join(
+ line if prompt is None else f"{prompt} {line}"
+ for prompt, line in zip(prompts, text.splitlines())
+ ) + "\n"
+
+
def copy_with_prompts_callback(self, event=None):
"""Copy selected lines to the clipboard, with prompts.
@@ -996,31 +1014,15 @@ def copy_with_prompts_callback(self, event=None):
and/or last lines is selected.
"""
text = self.text
-
- selection_indexes = (
- self.text.index("sel.first linestart"),
- self.text.index("sel.last +1line linestart"),
- )
- if selection_indexes[0] is None:
- # There is no selection, so do nothing.
- return
-
- selected_text = self.text.get(*selection_indexes)
- selection_lineno_range = range(
- int(float(selection_indexes[0])),
- int(float(selection_indexes[1]))
- )
- prompts = [
- self.shell_sidebar.line_prompts.get(lineno)
- for lineno in selection_lineno_range
- ]
- selected_text_with_prompts = "\n".join(
- line if prompt is None else f"{prompt} {line}"
- for prompt, line in zip(prompts, selected_text.splitlines())
- ) + "\n"
-
+ selfirst = text.index('sel.first linestart')
+ if selfirst is None: # Should not be possible.
+ return # No selection, do nothing.
+ sellast = text.index('sel.last')
+ if sellast[-1] != '0':
+ sellast = text.index("sel.last+1line linestart")
text.clipboard_clear()
- text.clipboard_append(selected_text_with_prompts)
+ prompt_text = self.get_prompt_text(selfirst, sellast)
+ text.clipboard_append(prompt_text)
reading = False
executing = False
@@ -1362,19 +1364,19 @@ def runit(self):
self.text.tag_remove(self.user_input_insert_tags, index_before)
self.shell_sidebar.update_sidebar()
- def open_stack_viewer(self, event=None):
+ def open_stack_viewer(self, event=None): # -n mode only
if self.interp.rpcclt:
return self.interp.remote_stack_viewer()
+
+ from idlelib.stackviewer import StackBrowser
try:
- sys.last_traceback
+ StackBrowser(self.root, sys.last_value, self.flist)
except:
messagebox.showerror("No stack trace",
"There is no stack trace yet.\n"
- "(sys.last_traceback is not defined)",
+ "(sys.last_value is not defined)",
parent=self.text)
- return
- from idlelib.stackviewer import StackBrowser
- StackBrowser(self.root, self.flist)
+ return None
def view_restart_mark(self, event=None):
self.text.see("iomark")
@@ -1535,7 +1537,7 @@ def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "c:deihnr:st:")
except getopt.error as msg:
- print("Error: %s\n%s" % (msg, usage_msg), file=sys.stderr)
+ print(f"Error: {msg}\n{usage_msg}", file=sys.stderr)
sys.exit(2)
for o, a in opts:
if o == '-c':
@@ -1667,9 +1669,9 @@ def main():
if cmd or script:
shell.interp.runcommand("""if 1:
import sys as _sys
- _sys.argv = %r
+ _sys.argv = {!r}
del _sys
- \n""" % (sys.argv,))
+ \n""".format(sys.argv))
if cmd:
shell.interp.execsource(cmd)
elif script:
@@ -1692,6 +1694,7 @@ def main():
root.destroy()
capture_warnings(False)
+
if __name__ == "__main__":
main()
diff --git a/Lib/idlelib/query.py b/Lib/idlelib/query.py
index df02f2123ab02f..57230e2aaca66d 100644
--- a/Lib/idlelib/query.py
+++ b/Lib/idlelib/query.py
@@ -368,7 +368,7 @@ def create_extra(self):
sticky='we')
def cli_args_ok(self):
- "Validity check and parsing for command line arguments."
+ "Return command line arg list or None if error."
cli_string = self.entry.get().strip()
try:
cli_args = shlex.split(cli_string, posix=True)
diff --git a/Lib/idlelib/redirector.py b/Lib/idlelib/redirector.py
index 9ab34c5acfb22c..08728956abd900 100644
--- a/Lib/idlelib/redirector.py
+++ b/Lib/idlelib/redirector.py
@@ -47,9 +47,8 @@ def __init__(self, widget):
tk.createcommand(w, self.dispatch)
def __repr__(self):
- return "%s(%s<%s>)" % (self.__class__.__name__,
- self.widget.__class__.__name__,
- self.widget._w)
+ w = self.widget
+ return f"{self.__class__.__name__,}({w.__class__.__name__}<{w._w}>)"
def close(self):
"Unregister operations and revert redirection created by .__init__."
@@ -143,8 +142,7 @@ def __init__(self, redir, operation):
self.orig_and_operation = (redir.orig, operation)
def __repr__(self):
- return "%s(%r, %r)" % (self.__class__.__name__,
- self.redir, self.operation)
+ return f"{self.__class__.__name__,}({self.redir!r}, {self.operation!r})"
def __call__(self, *args):
return self.tk_call(self.orig_and_operation + args)
@@ -166,6 +164,7 @@ def my_insert(*args):
original_insert(*args)
original_insert = redir.register("insert", my_insert)
+
if __name__ == "__main__":
from unittest import main
main('idlelib.idle_test.test_redirector', verbosity=2, exit=False)
diff --git a/Lib/idlelib/replace.py b/Lib/idlelib/replace.py
index ca83173877ad1d..1cddb638b217ff 100644
--- a/Lib/idlelib/replace.py
+++ b/Lib/idlelib/replace.py
@@ -4,6 +4,7 @@
and replace+find.
"""
import re
+re.PatternError = re.error # New in 3.13.
from tkinter import StringVar, TclError
@@ -25,7 +26,8 @@ def replace(text, insert_tags=None):
if not hasattr(engine, "_replacedialog"):
engine._replacedialog = ReplaceDialog(root, engine)
dialog = engine._replacedialog
- dialog.open(text, insert_tags=insert_tags)
+ searchphrase = text.get("sel.first", "sel.last")
+ dialog.open(text, searchphrase, insert_tags=insert_tags)
class ReplaceDialog(SearchDialogBase):
@@ -51,27 +53,17 @@ def __init__(self, root, engine):
self.replvar = StringVar(root)
self.insert_tags = None
- def open(self, text, insert_tags=None):
+ def open(self, text, searchphrase=None, *, insert_tags=None):
"""Make dialog visible on top of others and ready to use.
- Also, highlight the currently selected text and set the
- search to include the current selection (self.ok).
+ Also, set the search to include the current selection
+ (self.ok).
Args:
text: Text widget being searched.
+ searchphrase: String phrase to search.
"""
- SearchDialogBase.open(self, text)
- try:
- first = text.index("sel.first")
- except TclError:
- first = None
- try:
- last = text.index("sel.last")
- except TclError:
- last = None
- first = first or text.index("insert")
- last = last or first
- self.show_hit(first, last)
+ SearchDialogBase.open(self, text, searchphrase)
self.ok = True
self.insert_tags = insert_tags
@@ -120,7 +112,7 @@ def _replace_expand(self, m, repl):
if self.engine.isre():
try:
new = m.expand(repl)
- except re.error:
+ except re.PatternError:
self.engine.report_error(repl, 'Invalid Replace Expression')
new = None
else:
@@ -299,6 +291,7 @@ def show_replace():
button = Button(frame, text="Replace", command=show_replace)
button.pack()
+
if __name__ == '__main__':
from unittest import main
main('idlelib.idle_test.test_replace', verbosity=2, exit=False)
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index 8efcf048fa3aa2..3f0b2230dd185d 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -158,8 +158,8 @@ def debug(self, *args):
s = s + " " + str(a)
print(s, file=sys.__stderr__)
- def register(self, oid, object):
- self.objtable[oid] = object
+ def register(self, oid, object_):
+ self.objtable[oid] = object_
def unregister(self, oid):
try:
@@ -174,7 +174,7 @@ def localcall(self, seq, request):
except TypeError:
return ("ERROR", "Bad request format")
if oid not in self.objtable:
- return ("ERROR", "Unknown object id: %r" % (oid,))
+ return ("ERROR", f"Unknown object id: {oid!r}")
obj = self.objtable[oid]
if methodname == "__methods__":
methods = {}
@@ -185,7 +185,7 @@ def localcall(self, seq, request):
_getattributes(obj, attributes)
return ("OK", attributes)
if not hasattr(obj, methodname):
- return ("ERROR", "Unsupported method name: %r" % (methodname,))
+ return ("ERROR", f"Unsupported method name: {methodname!r}")
method = getattr(obj, methodname)
try:
if how == 'CALL':
@@ -307,7 +307,7 @@ def _getresponse(self, myseq, wait):
self.debug("_getresponse:myseq:", myseq)
if threading.current_thread() is self.sockthread:
# this thread does all reading of requests or responses
- while 1:
+ while True:
response = self.pollresponse(myseq, wait)
if response is not None:
return response
@@ -417,7 +417,7 @@ def pollresponse(self, myseq, wait):
self.responses and notify the owning thread.
"""
- while 1:
+ while True:
# send queued response if there is one available
try:
qmsg = response_queue.get(0)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index aaa9b5ce8d181f..9830e2b5be44a6 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -52,13 +52,13 @@ def idle_formatwarning(message, category, filename, lineno, line=None):
"""Format warnings the IDLE way."""
s = "\nWarning (from warnings module):\n"
- s += ' File \"%s\", line %s\n' % (filename, lineno)
+ s += f' File \"{filename}\", line {lineno}\n'
if line is None:
line = linecache.getline(filename, lineno)
line = line.strip()
if line:
s += " %s\n" % line
- s += "%s: %s\n" % (category.__name__, message)
+ s += f"{category.__name__}: {message}\n"
return s
def idle_showwarning_subproc(
@@ -140,12 +140,13 @@ def main(del_exitfunc=False):
capture_warnings(True)
sys.argv[:] = [""]
- sockthread = threading.Thread(target=manage_socket,
- name='SockThread',
- args=((LOCALHOST, port),))
- sockthread.daemon = True
- sockthread.start()
- while 1:
+ threading.Thread(target=manage_socket,
+ name='SockThread',
+ args=((LOCALHOST, port),),
+ daemon=True,
+ ).start()
+
+ while True:
try:
if exit_now:
try:
@@ -621,7 +622,7 @@ def get_the_completion_list(self, what, mode):
def stackviewer(self, flist_oid=None):
if self.user_exc_info:
- typ, val, tb = self.user_exc_info
+ _, exc, tb = self.user_exc_info
else:
return None
flist = None
@@ -629,9 +630,8 @@ def stackviewer(self, flist_oid=None):
flist = self.rpchandler.get_remote_proxy(flist_oid)
while tb and tb.tb_frame.f_globals["__name__"] in ["rpc", "run"]:
tb = tb.tb_next
- sys.last_type = typ
- sys.last_value = val
- item = stackviewer.StackTreeItem(flist, tb)
+ exc.__traceback__ = tb
+ item = stackviewer.StackTreeItem(exc, flist)
return debugobj_r.remote_object_tree_item(item)
diff --git a/Lib/idlelib/scrolledlist.py b/Lib/idlelib/scrolledlist.py
index 71fd18ab19ec8a..4fb418db326255 100644
--- a/Lib/idlelib/scrolledlist.py
+++ b/Lib/idlelib/scrolledlist.py
@@ -132,6 +132,7 @@ def _scrolled_list(parent): # htest #
top = Toplevel(parent)
x, y = map(int, parent.geometry().split('+')[1:])
top.geometry("+%d+%d" % (x+200, y + 175))
+
class MyScrolledList(ScrolledList):
def fill_menu(self): self.menu.add_command(label="right click")
def on_select(self, index): print("select", self.get(index))
@@ -141,9 +142,10 @@ def on_double(self, index): print("double", self.get(index))
for i in range(30):
scrolled_list.append("Item %02d" % i)
+
if __name__ == '__main__':
from unittest import main
- main('idlelib.idle_test.test_scrolledlist', verbosity=2,)
+ main('idlelib.idle_test.test_scrolledlist', verbosity=2, exit=False)
from idlelib.idle_test.htest import run
run(_scrolled_list)
diff --git a/Lib/idlelib/search.py b/Lib/idlelib/search.py
index b35f3b59c3d2e8..935a4832257fa4 100644
--- a/Lib/idlelib/search.py
+++ b/Lib/idlelib/search.py
@@ -156,6 +156,7 @@ def show_find():
button = Button(frame, text="Search (selection ignored)", command=show_find)
button.pack()
+
if __name__ == '__main__':
from unittest import main
main('idlelib.idle_test.test_search', verbosity=2, exit=False)
diff --git a/Lib/idlelib/searchengine.py b/Lib/idlelib/searchengine.py
index eddef581ab40a7..5119de05865b7a 100644
--- a/Lib/idlelib/searchengine.py
+++ b/Lib/idlelib/searchengine.py
@@ -1,5 +1,6 @@
'''Define SearchEngine for search dialogs.'''
import re
+re.PatternError = re.error # New in 3.13.
from tkinter import StringVar, BooleanVar, TclError
from tkinter import messagebox
@@ -84,7 +85,7 @@ def getprog(self):
flags = flags | re.IGNORECASE
try:
prog = re.compile(pat, flags)
- except re.error as e:
+ except re.PatternError as e:
self.report_error(pat, e.msg, e.pos)
return None
return prog
@@ -165,7 +166,7 @@ def search_backward(self, text, prog, line, col, wrap, ok=0):
wrapped = 0
startline = line
chars = text.get("%d.0" % line, "%d.0" % (line+1))
- while 1:
+ while True:
m = search_reverse(prog, chars[:-1], col)
if m:
if ok or m.start() < col:
diff --git a/Lib/idlelib/sidebar.py b/Lib/idlelib/sidebar.py
index fb1084dbf3f18b..f05a2b00623eb0 100644
--- a/Lib/idlelib/sidebar.py
+++ b/Lib/idlelib/sidebar.py
@@ -514,16 +514,16 @@ def update_colors(self):
self.change_callback()
-def _linenumbers_drag_scrolling(parent): # htest #
+def _sidebar_number_scrolling(parent): # htest #
from idlelib.idle_test.test_sidebar import Dummy_editwin
- toplevel = tk.Toplevel(parent)
- text_frame = tk.Frame(toplevel)
+ top = tk.Toplevel(parent)
+ text_frame = tk.Frame(top)
text_frame.pack(side=tk.LEFT, fill=tk.BOTH, expand=True)
text_frame.rowconfigure(1, weight=1)
text_frame.columnconfigure(1, weight=1)
- font = idleConf.GetFont(toplevel, 'main', 'EditorWindow')
+ font = idleConf.GetFont(top, 'main', 'EditorWindow')
text = tk.Text(text_frame, width=80, height=24, wrap=tk.NONE, font=font)
text.grid(row=1, column=1, sticky=tk.NSEW)
@@ -541,4 +541,4 @@ def _linenumbers_drag_scrolling(parent): # htest #
main('idlelib.idle_test.test_sidebar', verbosity=2, exit=False)
from idlelib.idle_test.htest import run
- run(_linenumbers_drag_scrolling)
+ run(_sidebar_number_scrolling)
diff --git a/Lib/idlelib/stackviewer.py b/Lib/idlelib/stackviewer.py
index 94ffb4eff4dd26..95042d4debdc03 100644
--- a/Lib/idlelib/stackviewer.py
+++ b/Lib/idlelib/stackviewer.py
@@ -1,33 +1,32 @@
+# Rename to stackbrowser or possibly consolidate with browser.
+
import linecache
import os
-import sys
import tkinter as tk
from idlelib.debugobj import ObjectTreeItem, make_objecttreeitem
from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas
-def StackBrowser(root, flist=None, tb=None, top=None):
+def StackBrowser(root, exc, flist=None, top=None):
global sc, item, node # For testing.
if top is None:
top = tk.Toplevel(root)
sc = ScrolledCanvas(top, bg="white", highlightthickness=0)
sc.frame.pack(expand=1, fill="both")
- item = StackTreeItem(flist, tb)
+ item = StackTreeItem(exc, flist)
node = TreeNode(sc.canvas, None, item)
node.expand()
class StackTreeItem(TreeItem):
- def __init__(self, flist=None, tb=None):
+ def __init__(self, exc, flist=None):
self.flist = flist
- self.stack = self.get_stack(tb)
- self.text = self.get_exception()
+ self.stack = self.get_stack(None if exc is None else exc.__traceback__)
+ self.text = f"{type(exc).__name__}: {str(exc)}"
def get_stack(self, tb):
- if tb is None:
- tb = sys.last_traceback
stack = []
if tb and tb.tb_frame is None:
tb = tb.tb_next
@@ -36,17 +35,7 @@ def get_stack(self, tb):
tb = tb.tb_next
return stack
- def get_exception(self):
- type = sys.last_type
- value = sys.last_value
- if hasattr(type, "__name__"):
- type = type.__name__
- s = str(type)
- if value is not None:
- s = s + ": " + str(value)
- return s
-
- def GetText(self):
+ def GetText(self): # Titlecase names are overrides.
return self.text
def GetSubList(self):
@@ -112,19 +101,19 @@ def IsExpandable(self):
def GetSubList(self):
sublist = []
- for key in self.object.keys():
+ for key in self.object.keys(): # self.object not necessarily dict.
try:
value = self.object[key]
except KeyError:
continue
- def setfunction(value, key=key, object=self.object):
- object[key] = value
+ def setfunction(value, key=key, object_=self.object):
+ object_[key] = value
item = make_objecttreeitem(key + " =", value, setfunction)
sublist.append(item)
return sublist
-def _stack_viewer(parent): # htest #
+def _stackbrowser(parent): # htest #
from idlelib.pyshell import PyShellFileList
top = tk.Toplevel(parent)
top.title("Test StackViewer")
@@ -133,23 +122,13 @@ def _stack_viewer(parent): # htest #
flist = PyShellFileList(top)
try: # to obtain a traceback object
intentional_name_error
- except NameError:
- exc_type, exc_value, exc_tb = sys.exc_info()
- # inject stack trace to sys
- sys.last_type = exc_type
- sys.last_value = exc_value
- sys.last_traceback = exc_tb
-
- StackBrowser(top, flist=flist, top=top, tb=exc_tb)
+ except NameError as e:
+ StackBrowser(top, e, flist=flist, top=top)
- # restore sys to original state
- del sys.last_type
- del sys.last_value
- del sys.last_traceback
if __name__ == '__main__':
from unittest import main
main('idlelib.idle_test.test_stackviewer', verbosity=2, exit=False)
from idlelib.idle_test.htest import run
- run(_stack_viewer)
+ run(_stackbrowser)
diff --git a/Lib/idlelib/statusbar.py b/Lib/idlelib/statusbar.py
index 755fafb0ac6438..8445d4cc8dfdb9 100644
--- a/Lib/idlelib/statusbar.py
+++ b/Lib/idlelib/statusbar.py
@@ -26,6 +26,7 @@ def _multistatus_bar(parent): # htest #
x, y = map(int, parent.geometry().split('+')[1:])
top.geometry("+%d+%d" %(x, y + 175))
top.title("Test multistatus bar")
+
frame = Frame(top)
text = Text(frame, height=5, width=40)
text.pack()
@@ -42,6 +43,7 @@ def change():
button.pack(side='bottom')
frame.pack()
+
if __name__ == '__main__':
from unittest import main
main('idlelib.idle_test.test_statusbar', verbosity=2, exit=False)
diff --git a/Lib/idlelib/textview.py b/Lib/idlelib/textview.py
index a66c1a4309a617..23f0f4cb5027ec 100644
--- a/Lib/idlelib/textview.py
+++ b/Lib/idlelib/textview.py
@@ -169,7 +169,7 @@ def view_file(parent, title, filename, encoding, modal=True, wrap='word',
with contents of the file.
"""
try:
- with open(filename, 'r', encoding=encoding) as file:
+ with open(filename, encoding=encoding) as file:
contents = file.read()
except OSError:
showerror(title='File Load Error',
diff --git a/Lib/idlelib/tooltip.py b/Lib/idlelib/tooltip.py
index d714318dae8ef1..3983690dd41177 100644
--- a/Lib/idlelib/tooltip.py
+++ b/Lib/idlelib/tooltip.py
@@ -92,7 +92,7 @@ def __init__(self, anchor_widget, hover_delay=1000):
e.g. after hovering over the anchor widget with the mouse for enough
time.
"""
- super(OnHoverTooltipBase, self).__init__(anchor_widget)
+ super().__init__(anchor_widget)
self.hover_delay = hover_delay
self._after_id = None
@@ -107,7 +107,7 @@ def __del__(self):
self.anchor_widget.unbind("
