Mailman 3 January 2019 - Python-checkins

Daily reference leaks (4243df51fe43): sum=0
by solipsis＠pitrou.net Jan. 4, 2019

Jan. 4, 2019

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [-7, 8, -7] memory blocks, sum=-6 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_fork leaked [2, 0, 0] memory blocks, sum=2 test_multiprocessing_spawn leaked [-2, 1, 1] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflog1oAa0h', '--timeout', '7200']

1 0

bpo-31450: Remove documentation mentioning that subprocess's child_traceback is available with the parent process (GH-11422)
by Miss Islington (bot) Jan. 3, 2019

Jan. 3, 2019

https://github.com/python/cpython/commit/47c035f3efa77a439967776b5b6ba11d01… commit: 47c035f3efa77a439967776b5b6ba11d010ce466 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-03T12:01:44-08:00 summary: bpo-31450: Remove documentation mentioning that subprocess's child_traceback is available with the parent process (GH-11422) (cherry picked from commit 47a2fced84605a32b79aa3ebc543533ad1a976a1) Co-authored-by: Harmandeep Singh <harmandeep3091(a)gmail.com> files: M Doc/library/subprocess.rst diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 4a10c7a7d9c7..ff91b5d4c758 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -572,9 +572,7 @@ Exceptions ^^^^^^^^^^ Exceptions raised in the child process, before the new program has started to -execute, will be re-raised in the parent. Additionally, the exception object -will have one extra attribute called :attr:`child_traceback`, which is a string -containing traceback information from the child's point of view. +execute, will be re-raised in the parent. The most common exception raised is :exc:`OSError`. This occurs, for example, when trying to execute a non-existent file. Applications should prepare for

1 0

bpo-31450: Remove documentation mentioning that subprocess's child_traceback is available with the parent process (GH-11422)
by Gregory P. Smith Jan. 3, 2019

Jan. 3, 2019

https://github.com/python/cpython/commit/47a2fced84605a32b79aa3ebc543533ad1… commit: 47a2fced84605a32b79aa3ebc543533ad1a976a1 branch: master author: Harmandeep Singh <harmandeep3091(a)gmail.com> committer: Gregory P. Smith <greg(a)krypto.org> date: 2019-01-03T11:53:56-08:00 summary: bpo-31450: Remove documentation mentioning that subprocess's child_traceback is available with the parent process (GH-11422) files: M Doc/library/subprocess.rst diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 25f267cf8305..e7844587e908 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -572,9 +572,7 @@ Exceptions ^^^^^^^^^^ Exceptions raised in the child process, before the new program has started to -execute, will be re-raised in the parent. Additionally, the exception object -will have one extra attribute called :attr:`child_traceback`, which is a string -containing traceback information from the child's point of view. +execute, will be re-raised in the parent. The most common exception raised is :exc:`OSError`. This occurs, for example, when trying to execute a non-existent file. Applications should prepare for

1 0

bpo-35641: IDLE - format calltip properly when no docstring (GH-11415)
by Miss Islington (bot) Jan. 3, 2019

Jan. 3, 2019

https://github.com/python/cpython/commit/3c83cb7eed4f0e8b9f1cbf39263a2053a2… commit: 3c83cb7eed4f0e8b9f1cbf39263a2053a2483cb0 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-03T01:44:47-08:00 summary: bpo-35641: IDLE - format calltip properly when no docstring (GH-11415) (cherry picked from commit ab54b9a130c88f708077c2ef6c4963b632c132b3) Co-authored-by: Emmanuel Arias <emmanuelarias30(a)gmail.com> files: A Misc/NEWS.d/next/Library/2019-01-02-22-15-01.bpo-35641.QEaANl.rst M Lib/idlelib/calltip.py M Lib/idlelib/idle_test/test_calltip.py M Misc/ACKS diff --git a/Lib/idlelib/calltip.py b/Lib/idlelib/calltip.py index 758569a45fdf..2a9a131ed96b 100644 --- a/Lib/idlelib/calltip.py +++ b/Lib/idlelib/calltip.py @@ -167,7 +167,7 @@ def get_argspec(ob): if len(line) > _MAX_COLS: line = line[: _MAX_COLS - 3] + '...' lines.append(line) - argspec = '\n'.join(lines) + argspec = '\n'.join(lines) if not argspec: argspec = _default_callable_argspec return argspec diff --git a/Lib/idlelib/idle_test/test_calltip.py b/Lib/idlelib/idle_test/test_calltip.py index 0698d4f8b99e..833351bd7996 100644 --- a/Lib/idlelib/idle_test/test_calltip.py +++ b/Lib/idlelib/idle_test/test_calltip.py @@ -99,6 +99,35 @@ def test_signature_wrap(self): drop_whitespace=True, break_on_hyphens=True, tabsize=8, *, max_lines=None, placeholder=' [...]')''') + def test_properly_formated(self): + def foo(s='a'*100): + pass + + def bar(s='a'*100): + """Hello Guido""" + pass + + def baz(s='a'*100, z='b'*100): + pass + + indent = calltip._INDENT + + str_foo = "(s='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + indent + "aaaaaaaaa"\ + "aaaaaaaaaa')" + str_bar = "(s='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + indent + "aaaaaaaaa"\ + "aaaaaaaaaa')\nHello Guido" + str_baz = "(s='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + indent + "aaaaaaaaa"\ + "aaaaaaaaaa', z='bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"\ + "bbbbbbbbbbbbbbbbb\n" + indent + "bbbbbbbbbbbbbbbbbbbbbb"\ + "bbbbbbbbbbbbbbbbbbbbbb')" + + self.assertEqual(calltip.get_argspec(foo), str_foo) + self.assertEqual(calltip.get_argspec(bar), str_bar) + self.assertEqual(calltip.get_argspec(baz), str_baz) + def test_docline_truncation(self): def f(): pass f.__doc__ = 'a'*300 diff --git a/Misc/ACKS b/Misc/ACKS index f38408491288..027e01307225 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -60,6 +60,7 @@ Heidi Annexstad Ramchandra Apte Éric Araujo Alexandru Ardelean +Emmanuel Arias Alicia Arlen Jeffrey Armstrong Jason Asbahr diff --git a/Misc/NEWS.d/next/Library/2019-01-02-22-15-01.bpo-35641.QEaANl.rst b/Misc/NEWS.d/next/Library/2019-01-02-22-15-01.bpo-35641.QEaANl.rst new file mode 100644 index 000000000000..5abba690be48 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-02-22-15-01.bpo-35641.QEaANl.rst @@ -0,0 +1 @@ +Proper format `calltip` when the function has no docstring.

1 0

Daily reference leaks (4243df51fe43): sum=5
by solipsis＠pitrou.net Jan. 3, 2019

Jan. 3, 2019

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [7, 0, -7] memory blocks, sum=0 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_spawn leaked [-1, 2, 0] memory blocks, sum=1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogr_a4Lk', '--timeout', '7200']

1 0

bpo-35641: IDLE - format calltip properly when no docstring (GH-11415)
by Terry Jan Reedy Jan. 3, 2019

Jan. 3, 2019

https://github.com/python/cpython/commit/ab54b9a130c88f708077c2ef6c4963b632… commit: ab54b9a130c88f708077c2ef6c4963b632c132b3 branch: master author: Emmanuel Arias <emmanuelarias30(a)gmail.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2019-01-03T02:47:58-05:00 summary: bpo-35641: IDLE - format calltip properly when no docstring (GH-11415) files: A Misc/NEWS.d/next/Library/2019-01-02-22-15-01.bpo-35641.QEaANl.rst M Lib/idlelib/calltip.py M Lib/idlelib/idle_test/test_calltip.py M Misc/ACKS diff --git a/Lib/idlelib/calltip.py b/Lib/idlelib/calltip.py index 758569a45fdf..2a9a131ed96b 100644 --- a/Lib/idlelib/calltip.py +++ b/Lib/idlelib/calltip.py @@ -167,7 +167,7 @@ def get_argspec(ob): if len(line) > _MAX_COLS: line = line[: _MAX_COLS - 3] + '...' lines.append(line) - argspec = '\n'.join(lines) + argspec = '\n'.join(lines) if not argspec: argspec = _default_callable_argspec return argspec diff --git a/Lib/idlelib/idle_test/test_calltip.py b/Lib/idlelib/idle_test/test_calltip.py index 0698d4f8b99e..833351bd7996 100644 --- a/Lib/idlelib/idle_test/test_calltip.py +++ b/Lib/idlelib/idle_test/test_calltip.py @@ -99,6 +99,35 @@ def test_signature_wrap(self): drop_whitespace=True, break_on_hyphens=True, tabsize=8, *, max_lines=None, placeholder=' [...]')''') + def test_properly_formated(self): + def foo(s='a'*100): + pass + + def bar(s='a'*100): + """Hello Guido""" + pass + + def baz(s='a'*100, z='b'*100): + pass + + indent = calltip._INDENT + + str_foo = "(s='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + indent + "aaaaaaaaa"\ + "aaaaaaaaaa')" + str_bar = "(s='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + indent + "aaaaaaaaa"\ + "aaaaaaaaaa')\nHello Guido" + str_baz = "(s='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + indent + "aaaaaaaaa"\ + "aaaaaaaaaa', z='bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"\ + "bbbbbbbbbbbbbbbbb\n" + indent + "bbbbbbbbbbbbbbbbbbbbbb"\ + "bbbbbbbbbbbbbbbbbbbbbb')" + + self.assertEqual(calltip.get_argspec(foo), str_foo) + self.assertEqual(calltip.get_argspec(bar), str_bar) + self.assertEqual(calltip.get_argspec(baz), str_baz) + def test_docline_truncation(self): def f(): pass f.__doc__ = 'a'*300 diff --git a/Misc/ACKS b/Misc/ACKS index 63df5df4cbef..49b28153d3f7 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -60,6 +60,7 @@ Heidi Annexstad Ramchandra Apte Éric Araujo Alexandru Ardelean +Emmanuel Arias Alicia Arlen Jeffrey Armstrong Jason Asbahr diff --git a/Misc/NEWS.d/next/Library/2019-01-02-22-15-01.bpo-35641.QEaANl.rst b/Misc/NEWS.d/next/Library/2019-01-02-22-15-01.bpo-35641.QEaANl.rst new file mode 100644 index 000000000000..5abba690be48 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-02-22-15-01.bpo-35641.QEaANl.rst @@ -0,0 +1 @@ +Proper format `calltip` when the function has no docstring.

1 0

bpo-33987: IDLE - use ttk Frame for ttk widgets (GH-11395)
by Miss Islington (bot) Jan. 3, 2019

Jan. 3, 2019

https://github.com/python/cpython/commit/b364caa39999658e843151602356e52785… commit: b364caa39999658e843151602356e527851d6c68 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-02T19:22:10-08:00 summary: bpo-33987: IDLE - use ttk Frame for ttk widgets (GH-11395) (cherry picked from commit aff0adabf3ace62073076f4ce875ff568f2d3180) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/IDLE/2018-12-31-17-04-18.bpo-33987.fD92up.rst M Lib/idlelib/autocomplete_w.py M Lib/idlelib/config_key.py M Lib/idlelib/configdialog.py M Lib/idlelib/debugger.py M Lib/idlelib/grep.py M Lib/idlelib/idle_test/test_searchbase.py M Lib/idlelib/query.py M Lib/idlelib/replace.py M Lib/idlelib/scrolledlist.py M Lib/idlelib/search.py M Lib/idlelib/searchbase.py M Lib/idlelib/tree.py diff --git a/Lib/idlelib/autocomplete_w.py b/Lib/idlelib/autocomplete_w.py index 9e0d336523d4..7994bc0db170 100644 --- a/Lib/idlelib/autocomplete_w.py +++ b/Lib/idlelib/autocomplete_w.py @@ -4,7 +4,7 @@ import platform from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter.ttk import Frame, Scrollbar from idlelib.autocomplete import COMPLETE_FILES, COMPLETE_ATTRIBUTES from idlelib.multicall import MC_SHIFT diff --git a/Lib/idlelib/config_key.py b/Lib/idlelib/config_key.py index 21e84a94c9ff..4478323fcc2c 100644 --- a/Lib/idlelib/config_key.py +++ b/Lib/idlelib/config_key.py @@ -2,7 +2,7 @@ Dialog for building Tkinter accelerator key bindings """ from tkinter import Toplevel, Listbox, Text, StringVar, TclError -from tkinter.ttk import Button, Checkbutton, Entry, Frame, Label, Scrollbar +from tkinter.ttk import Frame, Button, Checkbutton, Entry, Label, Scrollbar from tkinter import messagebox import string import sys diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index 229dc8987433..5fdaf82de4de 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -14,7 +14,7 @@ TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW, HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END) -from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame, +from tkinter.ttk import (Frame, LabelFrame, Button, Checkbutton, Entry, Label, OptionMenu, Notebook, Radiobutton, Scrollbar, Style) import tkinter.colorchooser as tkColorChooser import tkinter.font as tkFont diff --git a/Lib/idlelib/debugger.py b/Lib/idlelib/debugger.py index 09f912c9af33..ccd03e46e161 100644 --- a/Lib/idlelib/debugger.py +++ b/Lib/idlelib/debugger.py @@ -2,7 +2,7 @@ import os from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter.ttk import Frame, Scrollbar from idlelib import macosx from idlelib.scrolledlist import ScrolledList diff --git a/Lib/idlelib/grep.py b/Lib/idlelib/grep.py index 8cc293c380de..873233ec1543 100644 --- a/Lib/idlelib/grep.py +++ b/Lib/idlelib/grep.py @@ -8,7 +8,7 @@ import sys from tkinter import StringVar, BooleanVar -from tkinter.ttk import Checkbutton +from tkinter.ttk import Checkbutton # Frame imported in ...Base from idlelib.searchbase import SearchDialogBase from idlelib import searchengine @@ -173,15 +173,18 @@ def findfiles(self, dir, base, rec): def _grep_dialog(parent): # htest # from tkinter import Toplevel, Text, SEL, END - from tkinter.ttk import Button + from tkinter.ttk import Frame, Button from idlelib.pyshell import PyShellFileList + top = Toplevel(parent) top.title("Test GrepDialog") x, y = map(int, parent.geometry().split('+')[1:]) top.geometry(f"+{x}+{y + 175}") flist = PyShellFileList(top) - text = Text(top, height=5) + frame = Frame(top) + frame.pack() + text = Text(frame, height=5) text.pack() def show_grep_dialog(): @@ -189,7 +192,7 @@ def show_grep_dialog(): grep(text, flist=flist) text.tag_remove(SEL, "1.0", END) - button = Button(top, text="Show GrepDialog", command=show_grep_dialog) + button = Button(frame, text="Show GrepDialog", command=show_grep_dialog) button.pack() if __name__ == "__main__": diff --git a/Lib/idlelib/idle_test/test_searchbase.py b/Lib/idlelib/idle_test/test_searchbase.py index 46c3ad111d17..09a7fff51de1 100644 --- a/Lib/idlelib/idle_test/test_searchbase.py +++ b/Lib/idlelib/idle_test/test_searchbase.py @@ -4,7 +4,8 @@ import unittest from test.support import requires -from tkinter import Tk, Frame ##, BooleanVar, StringVar +from tkinter import Tk +from tkinter.ttk import Frame from idlelib import searchengine as se from idlelib import searchbase as sdb from idlelib.idle_test.mock_idle import Func @@ -97,11 +98,12 @@ def test_make_frame(self): self.dialog.top = self.root frame, label = self.dialog.make_frame() self.assertEqual(label, '') - self.assertIsInstance(frame, Frame) + self.assertEqual(str(type(frame)), "<class 'tkinter.ttk.Frame'>") + # self.assertIsInstance(frame, Frame) fails when test is run by + # test_idle not run from IDLE editor. See issue 33987 PR. frame, label = self.dialog.make_frame('testlabel') self.assertEqual(label['text'], 'testlabel') - self.assertIsInstance(frame, Frame) def btn_test_setup(self, meth): self.dialog.top = self.root diff --git a/Lib/idlelib/query.py b/Lib/idlelib/query.py index c2628cceb739..f0b72553db87 100644 --- a/Lib/idlelib/query.py +++ b/Lib/idlelib/query.py @@ -1,6 +1,5 @@ """ Dialogs that query users and verify the answer before accepting. -Use ttk widgets, limiting use to tcl/tk 8.5+, as in IDLE 3.6+. Query is the generic base class for a popup dialog. The user must either enter a valid answer or close the dialog. diff --git a/Lib/idlelib/replace.py b/Lib/idlelib/replace.py index 83cf98756bdf..4a834eb7901e 100644 --- a/Lib/idlelib/replace.py +++ b/Lib/idlelib/replace.py @@ -205,12 +205,12 @@ def close(self, event=None): def _replace_dialog(parent): # htest # from tkinter import Toplevel, Text, END, SEL - from tkinter.ttk import Button + from tkinter.ttk import Frame, Button - box = Toplevel(parent) - box.title("Test ReplaceDialog") + top = Toplevel(parent) + top.title("Test ReplaceDialog") x, y = map(int, parent.geometry().split('+')[1:]) - box.geometry("+%d+%d" % (x, y + 175)) + top.geometry("+%d+%d" % (x, y + 175)) # mock undo delegator methods def undo_block_start(): @@ -219,7 +219,9 @@ def undo_block_start(): def undo_block_stop(): pass - text = Text(box, inactiveselectbackground='gray') + frame = Frame(top) + frame.pack() + text = Text(frame, inactiveselectbackground='gray') text.undo_block_start = undo_block_start text.undo_block_stop = undo_block_stop text.pack() @@ -231,7 +233,7 @@ def show_replace(): replace(text) text.tag_remove(SEL, "1.0", END) - button = Button(box, text="Replace", command=show_replace) + button = Button(frame, text="Replace", command=show_replace) button.pack() if __name__ == '__main__': diff --git a/Lib/idlelib/scrolledlist.py b/Lib/idlelib/scrolledlist.py index 10229b636292..71fd18ab19ec 100644 --- a/Lib/idlelib/scrolledlist.py +++ b/Lib/idlelib/scrolledlist.py @@ -1,5 +1,5 @@ from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter.ttk import Frame, Scrollbar from idlelib import macosx diff --git a/Lib/idlelib/search.py b/Lib/idlelib/search.py index 6223661c8e08..6e5a0c7973c7 100644 --- a/Lib/idlelib/search.py +++ b/Lib/idlelib/search.py @@ -75,13 +75,16 @@ def find_selection(self, text): def _search_dialog(parent): # htest # "Display search test box." from tkinter import Toplevel, Text - from tkinter.ttk import Button + from tkinter.ttk import Frame, Button - box = Toplevel(parent) - box.title("Test SearchDialog") + top = Toplevel(parent) + top.title("Test SearchDialog") x, y = map(int, parent.geometry().split('+')[1:]) - box.geometry("+%d+%d" % (x, y + 175)) - text = Text(box, inactiveselectbackground='gray') + top.geometry("+%d+%d" % (x, y + 175)) + + frame = Frame(top) + frame.pack() + text = Text(frame, inactiveselectbackground='gray') text.pack() text.insert("insert","This is a sample string.\n"*5) @@ -90,7 +93,7 @@ def show_find(): _setup(text).open(text) text.tag_remove('sel', '1.0', 'end') - button = Button(box, text="Search (selection ignored)", command=show_find) + button = Button(frame, text="Search (selection ignored)", command=show_find) button.pack() if __name__ == '__main__': diff --git a/Lib/idlelib/searchbase.py b/Lib/idlelib/searchbase.py index 348db660e3e9..f0e3d6f14ba4 100644 --- a/Lib/idlelib/searchbase.py +++ b/Lib/idlelib/searchbase.py @@ -1,7 +1,7 @@ '''Define SearchDialogBase used by Search, Replace, and Grep dialogs.''' -from tkinter import Toplevel, Frame -from tkinter.ttk import Entry, Label, Button, Checkbutton, Radiobutton +from tkinter import Toplevel +from tkinter.ttk import Frame, Entry, Label, Button, Checkbutton, Radiobutton class SearchDialogBase: diff --git a/Lib/idlelib/tree.py b/Lib/idlelib/tree.py index 05f864657fb8..21426cbb33e0 100644 --- a/Lib/idlelib/tree.py +++ b/Lib/idlelib/tree.py @@ -17,7 +17,7 @@ import os from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter.ttk import Frame, Scrollbar from idlelib.config import idleConf from idlelib import zoomheight diff --git a/Misc/NEWS.d/next/IDLE/2018-12-31-17-04-18.bpo-33987.fD92up.rst b/Misc/NEWS.d/next/IDLE/2018-12-31-17-04-18.bpo-33987.fD92up.rst new file mode 100644 index 000000000000..289a65cf532c --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-12-31-17-04-18.bpo-33987.fD92up.rst @@ -0,0 +1 @@ +Use ttk Frame for ttk widgets.

1 0

bpo-33987: IDLE - use ttk Frame for ttk widgets (GH-11395)
by Terry Jan Reedy Jan. 3, 2019

Jan. 3, 2019

https://github.com/python/cpython/commit/aff0adabf3ace62073076f4ce875ff568f… commit: aff0adabf3ace62073076f4ce875ff568f2d3180 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2019-01-02T22:04:06-05:00 summary: bpo-33987: IDLE - use ttk Frame for ttk widgets (GH-11395) files: A Misc/NEWS.d/next/IDLE/2018-12-31-17-04-18.bpo-33987.fD92up.rst M Lib/idlelib/autocomplete_w.py M Lib/idlelib/config_key.py M Lib/idlelib/configdialog.py M Lib/idlelib/debugger.py M Lib/idlelib/grep.py M Lib/idlelib/idle_test/test_searchbase.py M Lib/idlelib/query.py M Lib/idlelib/replace.py M Lib/idlelib/scrolledlist.py M Lib/idlelib/search.py M Lib/idlelib/searchbase.py M Lib/idlelib/tree.py diff --git a/Lib/idlelib/autocomplete_w.py b/Lib/idlelib/autocomplete_w.py index 9e0d336523d4..7994bc0db170 100644 --- a/Lib/idlelib/autocomplete_w.py +++ b/Lib/idlelib/autocomplete_w.py @@ -4,7 +4,7 @@ import platform from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter.ttk import Frame, Scrollbar from idlelib.autocomplete import COMPLETE_FILES, COMPLETE_ATTRIBUTES from idlelib.multicall import MC_SHIFT diff --git a/Lib/idlelib/config_key.py b/Lib/idlelib/config_key.py index 21e84a94c9ff..4478323fcc2c 100644 --- a/Lib/idlelib/config_key.py +++ b/Lib/idlelib/config_key.py @@ -2,7 +2,7 @@ Dialog for building Tkinter accelerator key bindings """ from tkinter import Toplevel, Listbox, Text, StringVar, TclError -from tkinter.ttk import Button, Checkbutton, Entry, Frame, Label, Scrollbar +from tkinter.ttk import Frame, Button, Checkbutton, Entry, Label, Scrollbar from tkinter import messagebox import string import sys diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index 229dc8987433..5fdaf82de4de 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -14,7 +14,7 @@ TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW, HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END) -from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame, +from tkinter.ttk import (Frame, LabelFrame, Button, Checkbutton, Entry, Label, OptionMenu, Notebook, Radiobutton, Scrollbar, Style) import tkinter.colorchooser as tkColorChooser import tkinter.font as tkFont diff --git a/Lib/idlelib/debugger.py b/Lib/idlelib/debugger.py index 09f912c9af33..ccd03e46e161 100644 --- a/Lib/idlelib/debugger.py +++ b/Lib/idlelib/debugger.py @@ -2,7 +2,7 @@ import os from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter.ttk import Frame, Scrollbar from idlelib import macosx from idlelib.scrolledlist import ScrolledList diff --git a/Lib/idlelib/grep.py b/Lib/idlelib/grep.py index 8cc293c380de..873233ec1543 100644 --- a/Lib/idlelib/grep.py +++ b/Lib/idlelib/grep.py @@ -8,7 +8,7 @@ import sys from tkinter import StringVar, BooleanVar -from tkinter.ttk import Checkbutton +from tkinter.ttk import Checkbutton # Frame imported in ...Base from idlelib.searchbase import SearchDialogBase from idlelib import searchengine @@ -173,15 +173,18 @@ def findfiles(self, dir, base, rec): def _grep_dialog(parent): # htest # from tkinter import Toplevel, Text, SEL, END - from tkinter.ttk import Button + from tkinter.ttk import Frame, Button from idlelib.pyshell import PyShellFileList + top = Toplevel(parent) top.title("Test GrepDialog") x, y = map(int, parent.geometry().split('+')[1:]) top.geometry(f"+{x}+{y + 175}") flist = PyShellFileList(top) - text = Text(top, height=5) + frame = Frame(top) + frame.pack() + text = Text(frame, height=5) text.pack() def show_grep_dialog(): @@ -189,7 +192,7 @@ def show_grep_dialog(): grep(text, flist=flist) text.tag_remove(SEL, "1.0", END) - button = Button(top, text="Show GrepDialog", command=show_grep_dialog) + button = Button(frame, text="Show GrepDialog", command=show_grep_dialog) button.pack() if __name__ == "__main__": diff --git a/Lib/idlelib/idle_test/test_searchbase.py b/Lib/idlelib/idle_test/test_searchbase.py index 46c3ad111d17..09a7fff51de1 100644 --- a/Lib/idlelib/idle_test/test_searchbase.py +++ b/Lib/idlelib/idle_test/test_searchbase.py @@ -4,7 +4,8 @@ import unittest from test.support import requires -from tkinter import Tk, Frame ##, BooleanVar, StringVar +from tkinter import Tk +from tkinter.ttk import Frame from idlelib import searchengine as se from idlelib import searchbase as sdb from idlelib.idle_test.mock_idle import Func @@ -97,11 +98,12 @@ def test_make_frame(self): self.dialog.top = self.root frame, label = self.dialog.make_frame() self.assertEqual(label, '') - self.assertIsInstance(frame, Frame) + self.assertEqual(str(type(frame)), "<class 'tkinter.ttk.Frame'>") + # self.assertIsInstance(frame, Frame) fails when test is run by + # test_idle not run from IDLE editor. See issue 33987 PR. frame, label = self.dialog.make_frame('testlabel') self.assertEqual(label['text'], 'testlabel') - self.assertIsInstance(frame, Frame) def btn_test_setup(self, meth): self.dialog.top = self.root diff --git a/Lib/idlelib/query.py b/Lib/idlelib/query.py index c2628cceb739..f0b72553db87 100644 --- a/Lib/idlelib/query.py +++ b/Lib/idlelib/query.py @@ -1,6 +1,5 @@ """ Dialogs that query users and verify the answer before accepting. -Use ttk widgets, limiting use to tcl/tk 8.5+, as in IDLE 3.6+. Query is the generic base class for a popup dialog. The user must either enter a valid answer or close the dialog. diff --git a/Lib/idlelib/replace.py b/Lib/idlelib/replace.py index 83cf98756bdf..4a834eb7901e 100644 --- a/Lib/idlelib/replace.py +++ b/Lib/idlelib/replace.py @@ -205,12 +205,12 @@ def close(self, event=None): def _replace_dialog(parent): # htest # from tkinter import Toplevel, Text, END, SEL - from tkinter.ttk import Button + from tkinter.ttk import Frame, Button - box = Toplevel(parent) - box.title("Test ReplaceDialog") + top = Toplevel(parent) + top.title("Test ReplaceDialog") x, y = map(int, parent.geometry().split('+')[1:]) - box.geometry("+%d+%d" % (x, y + 175)) + top.geometry("+%d+%d" % (x, y + 175)) # mock undo delegator methods def undo_block_start(): @@ -219,7 +219,9 @@ def undo_block_start(): def undo_block_stop(): pass - text = Text(box, inactiveselectbackground='gray') + frame = Frame(top) + frame.pack() + text = Text(frame, inactiveselectbackground='gray') text.undo_block_start = undo_block_start text.undo_block_stop = undo_block_stop text.pack() @@ -231,7 +233,7 @@ def show_replace(): replace(text) text.tag_remove(SEL, "1.0", END) - button = Button(box, text="Replace", command=show_replace) + button = Button(frame, text="Replace", command=show_replace) button.pack() if __name__ == '__main__': diff --git a/Lib/idlelib/scrolledlist.py b/Lib/idlelib/scrolledlist.py index 10229b636292..71fd18ab19ec 100644 --- a/Lib/idlelib/scrolledlist.py +++ b/Lib/idlelib/scrolledlist.py @@ -1,5 +1,5 @@ from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter.ttk import Frame, Scrollbar from idlelib import macosx diff --git a/Lib/idlelib/search.py b/Lib/idlelib/search.py index 6223661c8e08..6e5a0c7973c7 100644 --- a/Lib/idlelib/search.py +++ b/Lib/idlelib/search.py @@ -75,13 +75,16 @@ def find_selection(self, text): def _search_dialog(parent): # htest # "Display search test box." from tkinter import Toplevel, Text - from tkinter.ttk import Button + from tkinter.ttk import Frame, Button - box = Toplevel(parent) - box.title("Test SearchDialog") + top = Toplevel(parent) + top.title("Test SearchDialog") x, y = map(int, parent.geometry().split('+')[1:]) - box.geometry("+%d+%d" % (x, y + 175)) - text = Text(box, inactiveselectbackground='gray') + top.geometry("+%d+%d" % (x, y + 175)) + + frame = Frame(top) + frame.pack() + text = Text(frame, inactiveselectbackground='gray') text.pack() text.insert("insert","This is a sample string.\n"*5) @@ -90,7 +93,7 @@ def show_find(): _setup(text).open(text) text.tag_remove('sel', '1.0', 'end') - button = Button(box, text="Search (selection ignored)", command=show_find) + button = Button(frame, text="Search (selection ignored)", command=show_find) button.pack() if __name__ == '__main__': diff --git a/Lib/idlelib/searchbase.py b/Lib/idlelib/searchbase.py index 348db660e3e9..f0e3d6f14ba4 100644 --- a/Lib/idlelib/searchbase.py +++ b/Lib/idlelib/searchbase.py @@ -1,7 +1,7 @@ '''Define SearchDialogBase used by Search, Replace, and Grep dialogs.''' -from tkinter import Toplevel, Frame -from tkinter.ttk import Entry, Label, Button, Checkbutton, Radiobutton +from tkinter import Toplevel +from tkinter.ttk import Frame, Entry, Label, Button, Checkbutton, Radiobutton class SearchDialogBase: diff --git a/Lib/idlelib/tree.py b/Lib/idlelib/tree.py index 05f864657fb8..21426cbb33e0 100644 --- a/Lib/idlelib/tree.py +++ b/Lib/idlelib/tree.py @@ -17,7 +17,7 @@ import os from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter.ttk import Frame, Scrollbar from idlelib.config import idleConf from idlelib import zoomheight diff --git a/Misc/NEWS.d/next/IDLE/2018-12-31-17-04-18.bpo-33987.fD92up.rst b/Misc/NEWS.d/next/IDLE/2018-12-31-17-04-18.bpo-33987.fD92up.rst new file mode 100644 index 000000000000..289a65cf532c --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-12-31-17-04-18.bpo-33987.fD92up.rst @@ -0,0 +1 @@ +Use ttk Frame for ttk widgets.

1 0

bpo-35525: Correct the argument name for NNTP.starttls() (GH-11310)
by Miss Islington (bot) Jan. 2, 2019

Jan. 2, 2019

https://github.com/python/cpython/commit/d7cb2034bbaa26170cdc66eb54626e3ce1… commit: d7cb2034bbaa26170cdc66eb54626e3ce1b8678a branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-02T13:11:00-08:00 summary: bpo-35525: Correct the argument name for NNTP.starttls() (GH-11310) (cherry picked from commit e9a044ec16989bd4b39763c0588c17200a925350) Co-authored-by: Harmandeep Singh <harmandeep3091(a)gmail.com> files: M Doc/library/nntplib.rst diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst index d8ef8a692a95..56188c7ef538 100644 --- a/Doc/library/nntplib.rst +++ b/Doc/library/nntplib.rst @@ -232,10 +232,10 @@ tuples or objects that the method normally returns will be empty. .. versionadded:: 3.2 -.. method:: NNTP.starttls(ssl_context=None) +.. method:: NNTP.starttls(context=None) Send a ``STARTTLS`` command. This will enable encryption on the NNTP - connection. The *ssl_context* argument is optional and should be a + connection. The *context* argument is optional and should be a :class:`ssl.SSLContext` object. Please read :ref:`ssl-security` for best practices.

1 0

bpo-35525: Correct the argument name for NNTP.starttls() (GH-11310)
by Tal Einat Jan. 2, 2019

Jan. 2, 2019

https://github.com/python/cpython/commit/e9a044ec16989bd4b39763c0588c17200a… commit: e9a044ec16989bd4b39763c0588c17200a925350 branch: master author: Harmandeep Singh <harmandeep3091(a)gmail.com> committer: Tal Einat <taleinat+github(a)gmail.com> date: 2019-01-02T23:05:19+02:00 summary: bpo-35525: Correct the argument name for NNTP.starttls() (GH-11310) files: M Doc/library/nntplib.rst diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst index d8ef8a692a95..56188c7ef538 100644 --- a/Doc/library/nntplib.rst +++ b/Doc/library/nntplib.rst @@ -232,10 +232,10 @@ tuples or objects that the method normally returns will be empty. .. versionadded:: 3.2 -.. method:: NNTP.starttls(ssl_context=None) +.. method:: NNTP.starttls(context=None) Send a ``STARTTLS`` command. This will enable encryption on the NNTP - connection. The *ssl_context* argument is optional and should be a + connection. The *context* argument is optional and should be a :class:`ssl.SSLContext` object. Please read :ref:`ssl-security` for best practices.

1 0