Mailman 3 August 2017 - Python-checkins

[3.6] bpo-30617: IDLE: docstrings and unittest for outwin.py (GH-2046) (#3223)
by Terry Jan Reedy 27 Aug '17

27 Aug '17

https://github.com/python/cpython/commit/5c89c2fd8a0be0ad2f89f084775c5f9f76… commit: 5c89c2fd8a0be0ad2f89f084775c5f9f76687237 branch: 3.6 author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-08-27T18:29:24-04:00 summary: [3.6] bpo-30617: IDLE: docstrings and unittest for outwin.py (GH-2046) (#3223) Move some data and functions from the class to module level. Patch by Cheryl Sabella. (cherry picked from commit 998f496) files: A Lib/idlelib/idle_test/test_outwin.py A Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst M Lib/idlelib/outwin.py diff --git a/Lib/idlelib/idle_test/test_outwin.py b/Lib/idlelib/idle_test/test_outwin.py new file mode 100644 index 00000000000..231c7bf9cfb --- /dev/null +++ b/Lib/idlelib/idle_test/test_outwin.py @@ -0,0 +1,172 @@ +""" Test idlelib.outwin. +""" + +import unittest +from tkinter import Tk, Text +from idlelib.idle_test.mock_tk import Mbox_func +from idlelib.idle_test.mock_idle import Func +from idlelib import outwin +from test.support import requires +from unittest import mock + + +class OutputWindowTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + w = cls.window = outwin.OutputWindow(None, None, None, root) + cls.text = w.text = Text(root) + + @classmethod + def tearDownClass(cls): + cls.window.close() + del cls.text, cls.window + cls.root.destroy() + del cls.root + + def setUp(self): + self.text.delete('1.0', 'end') + + def test_ispythonsource(self): + # OutputWindow overrides ispythonsource to always return False. + w = self.window + self.assertFalse(w.ispythonsource('test.txt')) + self.assertFalse(w.ispythonsource(__file__)) + + def test_window_title(self): + self.assertEqual(self.window.top.title(), 'Output') + + def test_maybesave(self): + w = self.window + eq = self.assertEqual + w.get_saved = Func() + + w.get_saved.result = False + eq(w.maybesave(), 'no') + eq(w.get_saved.called, 1) + + w.get_saved.result = True + eq(w.maybesave(), 'yes') + eq(w.get_saved.called, 2) + del w.get_saved + + def test_write(self): + eq = self.assertEqual + delete = self.text.delete + get = self.text.get + write = self.window.write + + # Test bytes. + b = b'Test bytes.' + eq(write(b), len(b)) + eq(get('1.0', '1.end'), b.decode()) + + # No new line - insert stays on same line. + delete('1.0', 'end') + test_text = 'test text' + eq(write(test_text), len(test_text)) + eq(get('1.0', '1.end'), 'test text') + eq(get('insert linestart', 'insert lineend'), 'test text') + + # New line - insert moves to next line. + delete('1.0', 'end') + test_text = 'test text\n' + eq(write(test_text), len(test_text)) + eq(get('1.0', '1.end'), 'test text') + eq(get('insert linestart', 'insert lineend'), '') + + # Text after new line is tagged for second line of Text widget. + delete('1.0', 'end') + test_text = 'test text\nLine 2' + eq(write(test_text), len(test_text)) + eq(get('1.0', '1.end'), 'test text') + eq(get('2.0', '2.end'), 'Line 2') + eq(get('insert linestart', 'insert lineend'), 'Line 2') + + # Test tags. + delete('1.0', 'end') + test_text = 'test text\n' + test_text2 = 'Line 2\n' + eq(write(test_text, tags='mytag'), len(test_text)) + eq(write(test_text2, tags='secondtag'), len(test_text2)) + eq(get('mytag.first', 'mytag.last'), test_text) + eq(get('secondtag.first', 'secondtag.last'), test_text2) + eq(get('1.0', '1.end'), test_text.rstrip('\n')) + eq(get('2.0', '2.end'), test_text2.rstrip('\n')) + + def test_writelines(self): + eq = self.assertEqual + get = self.text.get + writelines = self.window.writelines + + writelines(('Line 1\n', 'Line 2\n', 'Line 3\n')) + eq(get('1.0', '1.end'), 'Line 1') + eq(get('2.0', '2.end'), 'Line 2') + eq(get('3.0', '3.end'), 'Line 3') + eq(get('insert linestart', 'insert lineend'), '') + + def test_goto_file_line(self): + eq = self.assertEqual + w = self.window + text = self.text + + w.flist = mock.Mock() + gfl = w.flist.gotofileline = Func() + showerror = w.showerror = Mbox_func() + + # No file/line number. + w.write('Not a file line') + self.assertIsNone(w.goto_file_line()) + eq(gfl.called, 0) + eq(showerror.title, 'No special line') + + # Current file/line number. + w.write(f'{str(__file__)}: 42: spam\n') + w.write(f'{str(__file__)}: 21: spam') + self.assertIsNone(w.goto_file_line()) + eq(gfl.args, (str(__file__), 21)) + + # Previous line has file/line number. + text.delete('1.0', 'end') + w.write(f'{str(__file__)}: 42: spam\n') + w.write('Not a file line') + self.assertIsNone(w.goto_file_line()) + eq(gfl.args, (str(__file__), 42)) + + del w.flist.gotofileline, w.showerror + + +class ModuleFunctionTest(unittest.TestCase): + + @classmethod + def setUp(cls): + outwin.file_line_progs = None + + def test_compile_progs(self): + outwin.compile_progs() + for pat, regex in zip(outwin.file_line_pats, outwin.file_line_progs): + self.assertEqual(regex.pattern, pat) + + @mock.patch('builtins.open') + def test_file_line_helper(self, mock_open): + flh = outwin.file_line_helper + test_lines = ( + (r'foo file "testfile1", line 42, bar', ('testfile1', 42)), + (r'foo testfile2(21) bar', ('testfile2', 21)), + (r' testfile3 : 42: foo bar\n', (' testfile3 ', 42)), + (r'foo testfile4.py :1: ', ('foo testfile4.py ', 1)), + ('testfile5: \u19D4\u19D2: ', ('testfile5', 42)), + (r'testfile6: 42', None), # only one `:` + (r'testfile7 42 text', None) # no separators + ) + 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') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/outwin.py b/Lib/idlelib/outwin.py index f6d2915c624..5f7c09fb92c 100644 --- a/Lib/idlelib/outwin.py +++ b/Lib/idlelib/outwin.py @@ -1,43 +1,113 @@ +"""Editor window that can serve as an output file. +""" + import re -from tkinter import * -import tkinter.messagebox as tkMessageBox +from tkinter import messagebox from idlelib.editor import EditorWindow from idlelib import iomenu -class OutputWindow(EditorWindow): +file_line_pats = [ + # order of patterns matters + r'file "([^"]*)", line (\d+)', + r'([^\s]+)$(\d+)$', + r'^(\s*\S.*?):\s*(\d+):', # Win filename, maybe starting with spaces + r'([^\s]+):\s*(\d+):', # filename or path, ltrim + r'^\s*(\S.*?):\s*(\d+):', # Win abs path with embedded spaces, ltrim +] + +file_line_progs = None + + +def compile_progs(): + "Compile the patterns for matching to file name and line number." + global file_line_progs + file_line_progs = [re.compile(pat, re.IGNORECASE) + for pat in file_line_pats] + +def file_line_helper(line): + """Extract file name and line number from line of text. + + Check if line of text contains one of the file/line patterns. + If it does and if the file and line are valid, return + a tuple of the file name and line number. If it doesn't match + or if the file or line is invalid, return None. + """ + if not file_line_progs: + compile_progs() + for prog in file_line_progs: + match = prog.search(line) + if match: + filename, lineno = match.group(1, 2) + try: + f = open(filename, "r") + f.close() + break + except OSError: + continue + else: + return None + try: + return filename, int(lineno) + except TypeError: + return None + + +class OutputWindow(EditorWindow): """An editor window that can serve as an output file. Also the future base class for the Python shell window. This class has no input facilities. + + Adds binding to open a file at a line to the text widget. """ + # Our own right-button menu + rmenu_specs = [ + ("Cut", "<<cut>>", "rmenu_check_cut"), + ("Copy", "<<copy>>", "rmenu_check_copy"), + ("Paste", "<<paste>>", "rmenu_check_paste"), + (None, None, None), + ("Go to file/line", "<<goto-file-line>>", None), + ] + def __init__(self, *args): EditorWindow.__init__(self, *args) self.text.bind("<<goto-file-line>>", self.goto_file_line) # Customize EditorWindow - def ispythonsource(self, filename): - # No colorization needed - return 0 + "Python source is only part of output: do not colorize." + return False def short_title(self): + "Customize EditorWindow title." return "Output" def maybesave(self): - # Override base class method -- don't ask any questions - if self.get_saved(): - return "yes" - else: - return "no" + "Customize EditorWindow to not display save file messagebox." + return 'yes' if self.get_saved() else 'no' # Act as output file - def write(self, s, tags=(), mark="insert"): + """Write text to text widget. + + The text is inserted at the given index with the provided + tags. The text widget is then scrolled to make it visible + and updated to display it, giving the effect of seeing each + line as it is added. + + Args: + s: Text to insert into text widget. + tags: Tuple of tag strings to apply on the insert. + mark: Index for the insert. + + Return: + Length of text inserted. + """ if isinstance(s, (bytes, bytes)): s = s.decode(iomenu.encoding, "replace") self.text.insert(mark, s, tags) @@ -46,80 +116,46 @@ def write(self, s, tags=(), mark="insert"): return len(s) def writelines(self, lines): + "Write each item in lines iterable." for line in lines: self.write(line) def flush(self): + "No flushing needed as write() directly writes to widget." pass - # Our own right-button menu - - rmenu_specs = [ - ("Cut", "<<cut>>", "rmenu_check_cut"), - ("Copy", "<<copy>>", "rmenu_check_copy"), - ("Paste", "<<paste>>", "rmenu_check_paste"), - (None, None, None), - ("Go to file/line", "<<goto-file-line>>", None), - ] + def showerror(self, *args, **kwargs): + messagebox.showerror(*args, **kwargs) - file_line_pats = [ - # order of patterns matters - r'file "([^"]*)", line (\d+)', - r'([^\s]+)$(\d+)$', - r'^(\s*\S.*?):\s*(\d+):', # Win filename, maybe starting with spaces - r'([^\s]+):\s*(\d+):', # filename or path, ltrim - r'^\s*(\S.*?):\s*(\d+):', # Win abs path with embedded spaces, ltrim - ] + def goto_file_line(self, event=None): + """Handle request to open file/line. - file_line_progs = None + If the selected or previous line in the output window + contains a file name and line number, then open that file + name in a new window and position on the line number. - def goto_file_line(self, event=None): - if self.file_line_progs is None: - l = [] - for pat in self.file_line_pats: - l.append(re.compile(pat, re.IGNORECASE)) - self.file_line_progs = l - # x, y = self.event.x, self.event.y - # self.text.mark_set("insert", "@%d,%d" % (x, y)) + Otherwise, display an error messagebox. + """ line = self.text.get("insert linestart", "insert lineend") - result = self._file_line_helper(line) + result = file_line_helper(line) if not result: # Try the previous line. This is handy e.g. in tracebacks, # where you tend to right-click on the displayed source line line = self.text.get("insert -1line linestart", "insert -1line lineend") - result = self._file_line_helper(line) + result = file_line_helper(line) if not result: - tkMessageBox.showerror( + self.showerror( "No special line", "The line you point at doesn't look like " "a valid file name followed by a line number.", parent=self.text) return filename, lineno = result - edit = self.flist.open(filename) - edit.gotoline(lineno) - - def _file_line_helper(self, line): - for prog in self.file_line_progs: - match = prog.search(line) - if match: - filename, lineno = match.group(1, 2) - try: - f = open(filename, "r") - f.close() - break - except OSError: - continue - else: - return None - try: - return filename, int(lineno) - except TypeError: - return None + self.flist.gotofileline(filename, lineno) -# These classes are currently not used but might come in handy +# These classes are currently not used but might come in handy class OnDemandOutputWindow: tagdefs = { @@ -145,3 +181,7 @@ def setup(self): text.tag_configure(tag, **cnf) text.tag_raise('sel') self.write = self.owin.write + +if __name__ == '__main__': + import unittest + unittest.main('idlelib.idle_test.test_outwin', verbosity=2, exit=False) diff --git a/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst b/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst new file mode 100644 index 00000000000..262674c32dc --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst @@ -0,0 +1,4 @@ +IDLE - Add docstrings and tests for outwin subclass of editor. + +Move some data and functions from the class to module level. Patch by Cheryl +Sabella.

1 0

bpo-31191: Improve grammar in threading.Barrier docs (GH-3080) (GH-3224)
by Mariatta 27 Aug '17

27 Aug '17

https://github.com/python/cpython/commit/2dfafa3c565c0b51920269a891fa270848… commit: 2dfafa3c565c0b51920269a891fa270848b378d5 branch: 3.6 author: Mariatta <Mariatta(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-08-27T15:19:08-07:00 summary: bpo-31191: Improve grammar in threading.Barrier docs (GH-3080) (GH-3224) (cherry picked from commit 143be366295038b36fc32c44b8e1b48a375eab56) files: M Doc/library/threading.rst diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index cda859fe4cb..021e29e7124 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -875,8 +875,8 @@ Barrier Objects This class provides a simple synchronization primitive for use by a fixed number of threads that need to wait for each other. Each of the threads tries to pass the barrier by calling the :meth:`~Barrier.wait` method and will block until -all of the threads have made the call. At this points, the threads are released -simultaneously. +all of the threads have made their :meth:`~Barrier.wait` calls. At this point, +the threads are released simultaneously. The barrier can be reused any number of times for the same number of threads.

1 0

bpo-30617: IDLE: docstrings and unittest for outwin.py (#2046)
by Terry Jan Reedy 27 Aug '17

27 Aug '17

https://github.com/python/cpython/commit/998f4966bf0c591f3e8b3d07eccad7501f… commit: 998f4966bf0c591f3e8b3d07eccad7501f60f524 branch: master author: Cheryl Sabella <cheryl.sabella(a)gmail.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2017-08-27T18:06:00-04:00 summary: bpo-30617: IDLE: docstrings and unittest for outwin.py (#2046) Move some data and functions from the class to module level. Patch by Cheryl Sabella. files: A Lib/idlelib/idle_test/test_outwin.py A Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst M Lib/idlelib/outwin.py diff --git a/Lib/idlelib/idle_test/test_outwin.py b/Lib/idlelib/idle_test/test_outwin.py new file mode 100644 index 00000000000..231c7bf9cfb --- /dev/null +++ b/Lib/idlelib/idle_test/test_outwin.py @@ -0,0 +1,172 @@ +""" Test idlelib.outwin. +""" + +import unittest +from tkinter import Tk, Text +from idlelib.idle_test.mock_tk import Mbox_func +from idlelib.idle_test.mock_idle import Func +from idlelib import outwin +from test.support import requires +from unittest import mock + + +class OutputWindowTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + w = cls.window = outwin.OutputWindow(None, None, None, root) + cls.text = w.text = Text(root) + + @classmethod + def tearDownClass(cls): + cls.window.close() + del cls.text, cls.window + cls.root.destroy() + del cls.root + + def setUp(self): + self.text.delete('1.0', 'end') + + def test_ispythonsource(self): + # OutputWindow overrides ispythonsource to always return False. + w = self.window + self.assertFalse(w.ispythonsource('test.txt')) + self.assertFalse(w.ispythonsource(__file__)) + + def test_window_title(self): + self.assertEqual(self.window.top.title(), 'Output') + + def test_maybesave(self): + w = self.window + eq = self.assertEqual + w.get_saved = Func() + + w.get_saved.result = False + eq(w.maybesave(), 'no') + eq(w.get_saved.called, 1) + + w.get_saved.result = True + eq(w.maybesave(), 'yes') + eq(w.get_saved.called, 2) + del w.get_saved + + def test_write(self): + eq = self.assertEqual + delete = self.text.delete + get = self.text.get + write = self.window.write + + # Test bytes. + b = b'Test bytes.' + eq(write(b), len(b)) + eq(get('1.0', '1.end'), b.decode()) + + # No new line - insert stays on same line. + delete('1.0', 'end') + test_text = 'test text' + eq(write(test_text), len(test_text)) + eq(get('1.0', '1.end'), 'test text') + eq(get('insert linestart', 'insert lineend'), 'test text') + + # New line - insert moves to next line. + delete('1.0', 'end') + test_text = 'test text\n' + eq(write(test_text), len(test_text)) + eq(get('1.0', '1.end'), 'test text') + eq(get('insert linestart', 'insert lineend'), '') + + # Text after new line is tagged for second line of Text widget. + delete('1.0', 'end') + test_text = 'test text\nLine 2' + eq(write(test_text), len(test_text)) + eq(get('1.0', '1.end'), 'test text') + eq(get('2.0', '2.end'), 'Line 2') + eq(get('insert linestart', 'insert lineend'), 'Line 2') + + # Test tags. + delete('1.0', 'end') + test_text = 'test text\n' + test_text2 = 'Line 2\n' + eq(write(test_text, tags='mytag'), len(test_text)) + eq(write(test_text2, tags='secondtag'), len(test_text2)) + eq(get('mytag.first', 'mytag.last'), test_text) + eq(get('secondtag.first', 'secondtag.last'), test_text2) + eq(get('1.0', '1.end'), test_text.rstrip('\n')) + eq(get('2.0', '2.end'), test_text2.rstrip('\n')) + + def test_writelines(self): + eq = self.assertEqual + get = self.text.get + writelines = self.window.writelines + + writelines(('Line 1\n', 'Line 2\n', 'Line 3\n')) + eq(get('1.0', '1.end'), 'Line 1') + eq(get('2.0', '2.end'), 'Line 2') + eq(get('3.0', '3.end'), 'Line 3') + eq(get('insert linestart', 'insert lineend'), '') + + def test_goto_file_line(self): + eq = self.assertEqual + w = self.window + text = self.text + + w.flist = mock.Mock() + gfl = w.flist.gotofileline = Func() + showerror = w.showerror = Mbox_func() + + # No file/line number. + w.write('Not a file line') + self.assertIsNone(w.goto_file_line()) + eq(gfl.called, 0) + eq(showerror.title, 'No special line') + + # Current file/line number. + w.write(f'{str(__file__)}: 42: spam\n') + w.write(f'{str(__file__)}: 21: spam') + self.assertIsNone(w.goto_file_line()) + eq(gfl.args, (str(__file__), 21)) + + # Previous line has file/line number. + text.delete('1.0', 'end') + w.write(f'{str(__file__)}: 42: spam\n') + w.write('Not a file line') + self.assertIsNone(w.goto_file_line()) + eq(gfl.args, (str(__file__), 42)) + + del w.flist.gotofileline, w.showerror + + +class ModuleFunctionTest(unittest.TestCase): + + @classmethod + def setUp(cls): + outwin.file_line_progs = None + + def test_compile_progs(self): + outwin.compile_progs() + for pat, regex in zip(outwin.file_line_pats, outwin.file_line_progs): + self.assertEqual(regex.pattern, pat) + + @mock.patch('builtins.open') + def test_file_line_helper(self, mock_open): + flh = outwin.file_line_helper + test_lines = ( + (r'foo file "testfile1", line 42, bar', ('testfile1', 42)), + (r'foo testfile2(21) bar', ('testfile2', 21)), + (r' testfile3 : 42: foo bar\n', (' testfile3 ', 42)), + (r'foo testfile4.py :1: ', ('foo testfile4.py ', 1)), + ('testfile5: \u19D4\u19D2: ', ('testfile5', 42)), + (r'testfile6: 42', None), # only one `:` + (r'testfile7 42 text', None) # no separators + ) + 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') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/outwin.py b/Lib/idlelib/outwin.py index f6d2915c624..5f7c09fb92c 100644 --- a/Lib/idlelib/outwin.py +++ b/Lib/idlelib/outwin.py @@ -1,43 +1,113 @@ +"""Editor window that can serve as an output file. +""" + import re -from tkinter import * -import tkinter.messagebox as tkMessageBox +from tkinter import messagebox from idlelib.editor import EditorWindow from idlelib import iomenu -class OutputWindow(EditorWindow): +file_line_pats = [ + # order of patterns matters + r'file "([^"]*)", line (\d+)', + r'([^\s]+)$(\d+)$', + r'^(\s*\S.*?):\s*(\d+):', # Win filename, maybe starting with spaces + r'([^\s]+):\s*(\d+):', # filename or path, ltrim + r'^\s*(\S.*?):\s*(\d+):', # Win abs path with embedded spaces, ltrim +] + +file_line_progs = None + + +def compile_progs(): + "Compile the patterns for matching to file name and line number." + global file_line_progs + file_line_progs = [re.compile(pat, re.IGNORECASE) + for pat in file_line_pats] + +def file_line_helper(line): + """Extract file name and line number from line of text. + + Check if line of text contains one of the file/line patterns. + If it does and if the file and line are valid, return + a tuple of the file name and line number. If it doesn't match + or if the file or line is invalid, return None. + """ + if not file_line_progs: + compile_progs() + for prog in file_line_progs: + match = prog.search(line) + if match: + filename, lineno = match.group(1, 2) + try: + f = open(filename, "r") + f.close() + break + except OSError: + continue + else: + return None + try: + return filename, int(lineno) + except TypeError: + return None + + +class OutputWindow(EditorWindow): """An editor window that can serve as an output file. Also the future base class for the Python shell window. This class has no input facilities. + + Adds binding to open a file at a line to the text widget. """ + # Our own right-button menu + rmenu_specs = [ + ("Cut", "<<cut>>", "rmenu_check_cut"), + ("Copy", "<<copy>>", "rmenu_check_copy"), + ("Paste", "<<paste>>", "rmenu_check_paste"), + (None, None, None), + ("Go to file/line", "<<goto-file-line>>", None), + ] + def __init__(self, *args): EditorWindow.__init__(self, *args) self.text.bind("<<goto-file-line>>", self.goto_file_line) # Customize EditorWindow - def ispythonsource(self, filename): - # No colorization needed - return 0 + "Python source is only part of output: do not colorize." + return False def short_title(self): + "Customize EditorWindow title." return "Output" def maybesave(self): - # Override base class method -- don't ask any questions - if self.get_saved(): - return "yes" - else: - return "no" + "Customize EditorWindow to not display save file messagebox." + return 'yes' if self.get_saved() else 'no' # Act as output file - def write(self, s, tags=(), mark="insert"): + """Write text to text widget. + + The text is inserted at the given index with the provided + tags. The text widget is then scrolled to make it visible + and updated to display it, giving the effect of seeing each + line as it is added. + + Args: + s: Text to insert into text widget. + tags: Tuple of tag strings to apply on the insert. + mark: Index for the insert. + + Return: + Length of text inserted. + """ if isinstance(s, (bytes, bytes)): s = s.decode(iomenu.encoding, "replace") self.text.insert(mark, s, tags) @@ -46,80 +116,46 @@ def write(self, s, tags=(), mark="insert"): return len(s) def writelines(self, lines): + "Write each item in lines iterable." for line in lines: self.write(line) def flush(self): + "No flushing needed as write() directly writes to widget." pass - # Our own right-button menu - - rmenu_specs = [ - ("Cut", "<<cut>>", "rmenu_check_cut"), - ("Copy", "<<copy>>", "rmenu_check_copy"), - ("Paste", "<<paste>>", "rmenu_check_paste"), - (None, None, None), - ("Go to file/line", "<<goto-file-line>>", None), - ] + def showerror(self, *args, **kwargs): + messagebox.showerror(*args, **kwargs) - file_line_pats = [ - # order of patterns matters - r'file "([^"]*)", line (\d+)', - r'([^\s]+)$(\d+)$', - r'^(\s*\S.*?):\s*(\d+):', # Win filename, maybe starting with spaces - r'([^\s]+):\s*(\d+):', # filename or path, ltrim - r'^\s*(\S.*?):\s*(\d+):', # Win abs path with embedded spaces, ltrim - ] + def goto_file_line(self, event=None): + """Handle request to open file/line. - file_line_progs = None + If the selected or previous line in the output window + contains a file name and line number, then open that file + name in a new window and position on the line number. - def goto_file_line(self, event=None): - if self.file_line_progs is None: - l = [] - for pat in self.file_line_pats: - l.append(re.compile(pat, re.IGNORECASE)) - self.file_line_progs = l - # x, y = self.event.x, self.event.y - # self.text.mark_set("insert", "@%d,%d" % (x, y)) + Otherwise, display an error messagebox. + """ line = self.text.get("insert linestart", "insert lineend") - result = self._file_line_helper(line) + result = file_line_helper(line) if not result: # Try the previous line. This is handy e.g. in tracebacks, # where you tend to right-click on the displayed source line line = self.text.get("insert -1line linestart", "insert -1line lineend") - result = self._file_line_helper(line) + result = file_line_helper(line) if not result: - tkMessageBox.showerror( + self.showerror( "No special line", "The line you point at doesn't look like " "a valid file name followed by a line number.", parent=self.text) return filename, lineno = result - edit = self.flist.open(filename) - edit.gotoline(lineno) - - def _file_line_helper(self, line): - for prog in self.file_line_progs: - match = prog.search(line) - if match: - filename, lineno = match.group(1, 2) - try: - f = open(filename, "r") - f.close() - break - except OSError: - continue - else: - return None - try: - return filename, int(lineno) - except TypeError: - return None + self.flist.gotofileline(filename, lineno) -# These classes are currently not used but might come in handy +# These classes are currently not used but might come in handy class OnDemandOutputWindow: tagdefs = { @@ -145,3 +181,7 @@ def setup(self): text.tag_configure(tag, **cnf) text.tag_raise('sel') self.write = self.owin.write + +if __name__ == '__main__': + import unittest + unittest.main('idlelib.idle_test.test_outwin', verbosity=2, exit=False) diff --git a/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst b/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst new file mode 100644 index 00000000000..262674c32dc --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2017-08-27-16-49-36.bpo-30617.UHnswr.rst @@ -0,0 +1,4 @@ +IDLE - Add docstrings and tests for outwin subclass of editor. + +Move some data and functions from the class to module level. Patch by Cheryl +Sabella.

1 0

[3.6] bpo-31287: IDLE - do not alter tkinter.messagebox in configdialog tests. (GH-3220) (#3221)
by Terry Jan Reedy 27 Aug '17

27 Aug '17

https://github.com/python/cpython/commit/7e248904cd5b3e658b1792deca1b82d873… commit: 7e248904cd5b3e658b1792deca1b82d873b2d120 branch: 3.6 author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-08-27T17:14:19-04:00 summary: [3.6] bpo-31287: IDLE - do not alter tkinter.messagebox in configdialog tests. (GH-3220) (#3221) (cherry picked from commit 3457f42) files: A Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst M Lib/idlelib/configdialog.py M Lib/idlelib/idle_test/test_configdialog.py diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index ff7b638b51f..8afc9e6d692 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -18,7 +18,7 @@ Notebook, Radiobutton, Scrollbar, Style) import tkinter.colorchooser as tkColorChooser import tkinter.font as tkFont -import tkinter.messagebox as tkMessageBox +from tkinter import messagebox from idlelib.config import idleConf, ConfigChanges from idlelib.config_key import GetKeysDialog @@ -1227,6 +1227,10 @@ def save_new(self, theme_name, theme): value = theme[element] idleConf.userCfg['highlight'].SetOption(theme_name, element, value) + def askyesno(self, *args, **kwargs): + # Make testing easier. Could change implementation. + messagebox.askyesno(*args, **kwargs) + def delete_custom(self): """Handle event to delete custom theme. @@ -1251,7 +1255,7 @@ def delete_custom(self): """ theme_name = self.custom_name.get() delmsg = 'Are you sure you wish to delete the theme %r ?' - if not tkMessageBox.askyesno( + if not self.askyesno( 'Delete Theme', delmsg % theme_name, parent=self): return self.cd.deactivate_current_config() @@ -1669,6 +1673,10 @@ def save_new_key_set(keyset_name, keyset): value = keyset[event] idleConf.userCfg['keys'].SetOption(keyset_name, event, value) + def askyesno(self, *args, **kwargs): + # Make testing easier. Could change implementation. + messagebox.askyesno(*args, **kwargs) + def delete_custom_keys(self): """Handle event to delete a custom key set. @@ -1678,7 +1686,7 @@ def delete_custom_keys(self): """ keyset_name = self.custom_name.get() delmsg = 'Are you sure you wish to delete the key set %r ?' - if not tkMessageBox.askyesno( + if not self.askyesno( 'Delete Key Set', delmsg % keyset_name, parent=self): return self.cd.deactivate_current_config() diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py index c947da1866e..f116538faca 100644 --- a/Lib/idlelib/idle_test/test_configdialog.py +++ b/Lib/idlelib/idle_test/test_configdialog.py @@ -643,7 +643,7 @@ def test_delete_custom(self): eq = self.assertEqual d = self.page d.button_delete_custom.state(('!disabled',)) - yesno = configdialog.tkMessageBox.askyesno = Func() + yesno = d.askyesno = Func() dialog.deactivate_current_config = Func() dialog.activate_config_changes = Func() @@ -678,7 +678,7 @@ def test_delete_custom(self): eq(d.set_theme_type.called, 1) del dialog.activate_config_changes, dialog.deactivate_current_config - del configdialog.tkMessageBox.askyesno + del d.askyesno class KeysPageTest(unittest.TestCase): @@ -1034,7 +1034,7 @@ def test_delete_custom_keys(self): eq = self.assertEqual d = self.page d.button_delete_custom_keys.state(('!disabled',)) - yesno = configdialog.tkMessageBox.askyesno = Func() + yesno = d.askyesno = Func() dialog.deactivate_current_config = Func() dialog.activate_config_changes = Func() @@ -1069,7 +1069,7 @@ def test_delete_custom_keys(self): eq(d.set_keys_type.called, 1) del dialog.activate_config_changes, dialog.deactivate_current_config - del configdialog.tkMessageBox.askyesno + del d.askyesno class GenPageTest(unittest.TestCase): diff --git a/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst b/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst new file mode 100644 index 00000000000..9cd55573f87 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst @@ -0,0 +1 @@ +IDLE - Do not modify tkinter.message in test_configdialog.

1 0

bpo-31287: IDLE - do not alter tkinter.messagebox in configdialog tests. (#3220)
by Terry Jan Reedy 27 Aug '17

27 Aug '17

https://github.com/python/cpython/commit/3457f428964d0fd6ab601272ead276a9bf… commit: 3457f428964d0fd6ab601272ead276a9bf8b1eaf branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-08-27T16:39:41-04:00 summary: bpo-31287: IDLE - do not alter tkinter.messagebox in configdialog tests. (#3220) files: A Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst M Lib/idlelib/configdialog.py M Lib/idlelib/idle_test/test_configdialog.py diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index ff7b638b51f..8afc9e6d692 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -18,7 +18,7 @@ Notebook, Radiobutton, Scrollbar, Style) import tkinter.colorchooser as tkColorChooser import tkinter.font as tkFont -import tkinter.messagebox as tkMessageBox +from tkinter import messagebox from idlelib.config import idleConf, ConfigChanges from idlelib.config_key import GetKeysDialog @@ -1227,6 +1227,10 @@ def save_new(self, theme_name, theme): value = theme[element] idleConf.userCfg['highlight'].SetOption(theme_name, element, value) + def askyesno(self, *args, **kwargs): + # Make testing easier. Could change implementation. + messagebox.askyesno(*args, **kwargs) + def delete_custom(self): """Handle event to delete custom theme. @@ -1251,7 +1255,7 @@ def delete_custom(self): """ theme_name = self.custom_name.get() delmsg = 'Are you sure you wish to delete the theme %r ?' - if not tkMessageBox.askyesno( + if not self.askyesno( 'Delete Theme', delmsg % theme_name, parent=self): return self.cd.deactivate_current_config() @@ -1669,6 +1673,10 @@ def save_new_key_set(keyset_name, keyset): value = keyset[event] idleConf.userCfg['keys'].SetOption(keyset_name, event, value) + def askyesno(self, *args, **kwargs): + # Make testing easier. Could change implementation. + messagebox.askyesno(*args, **kwargs) + def delete_custom_keys(self): """Handle event to delete a custom key set. @@ -1678,7 +1686,7 @@ def delete_custom_keys(self): """ keyset_name = self.custom_name.get() delmsg = 'Are you sure you wish to delete the key set %r ?' - if not tkMessageBox.askyesno( + if not self.askyesno( 'Delete Key Set', delmsg % keyset_name, parent=self): return self.cd.deactivate_current_config() diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py index c947da1866e..f116538faca 100644 --- a/Lib/idlelib/idle_test/test_configdialog.py +++ b/Lib/idlelib/idle_test/test_configdialog.py @@ -643,7 +643,7 @@ def test_delete_custom(self): eq = self.assertEqual d = self.page d.button_delete_custom.state(('!disabled',)) - yesno = configdialog.tkMessageBox.askyesno = Func() + yesno = d.askyesno = Func() dialog.deactivate_current_config = Func() dialog.activate_config_changes = Func() @@ -678,7 +678,7 @@ def test_delete_custom(self): eq(d.set_theme_type.called, 1) del dialog.activate_config_changes, dialog.deactivate_current_config - del configdialog.tkMessageBox.askyesno + del d.askyesno class KeysPageTest(unittest.TestCase): @@ -1034,7 +1034,7 @@ def test_delete_custom_keys(self): eq = self.assertEqual d = self.page d.button_delete_custom_keys.state(('!disabled',)) - yesno = configdialog.tkMessageBox.askyesno = Func() + yesno = d.askyesno = Func() dialog.deactivate_current_config = Func() dialog.activate_config_changes = Func() @@ -1069,7 +1069,7 @@ def test_delete_custom_keys(self): eq(d.set_keys_type.called, 1) del dialog.activate_config_changes, dialog.deactivate_current_config - del configdialog.tkMessageBox.askyesno + del d.askyesno class GenPageTest(unittest.TestCase): diff --git a/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst b/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst new file mode 100644 index 00000000000..9cd55573f87 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2017-08-27-15-31-33.bpo-31287.aZERfI.rst @@ -0,0 +1 @@ +IDLE - Do not modify tkinter.message in test_configdialog.

1 0

Daily reference leaks (4243df51fe43): sum=13
by solipsis＠pitrou.net 27 Aug '17

27 Aug '17

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

1 0

Enables RC markings in nuget packages. (#3216)
by Steve Dower 27 Aug '17

27 Aug '17

https://github.com/python/cpython/commit/0b69b3723d018b197b94b173c3305bdef4… commit: 0b69b3723d018b197b94b173c3305bdef4c6b11b branch: 2.7 author: Steve Dower <steve.dower(a)microsoft.com> committer: GitHub <noreply(a)github.com> date: 2017-08-26T18:00:48-07:00 summary: Enables RC markings in nuget packages. (#3216) files: M Tools/nuget/make_pkg.proj diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj index cb124abb5e8..0f3f8bd000a 100644 --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -14,6 +14,7 @@ <PropertyGroup> <NuspecVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)</NuspecVersion> + <NuspecVersion Condition="$(ReleaseLevelName) != ''">$(NuspecVersion)-$(ReleaseLevelName)</NuspecVersion> <SignOutput>false</SignOutput> <TargetName>$(OutputName).$(NuspecVersion)</TargetName> <TargetExt>.nupkg</TargetExt>

1 0

coalesce blurbs for 2.7.14rc1
by Benjamin Peterson 26 Aug '17

26 Aug '17

https://github.com/python/cpython/commit/a944079d392dacd6f7baee9d8c8fd7bda2… commit: a944079d392dacd6f7baee9d8c8fd7bda25c2a18 branch: 2.7 author: Benjamin Peterson <benjamin(a)python.org> committer: Benjamin Peterson <benjamin(a)python.org> date: 2017-08-26T11:13:23-07:00 summary: coalesce blurbs for 2.7.14rc1 files: A Misc/NEWS.d/2.7.14rc1.rst D Misc/NEWS.d/next/Core and Builtins/2017-06-26-14-29-50.bpo-30765.Q5iBmf.rst D Misc/NEWS.d/next/Library/2017-06-29-22-04-44.bpo-30807.sLtjY-.rst D Misc/NEWS.d/next/Library/2017-07-07-02-18-57.bpo-29854.J8wKb_.rst D Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst D Misc/NEWS.d/next/Library/2017-07-26-04-46-12.bpo-30595.-zJ7d8.rst D Misc/NEWS.d/next/Library/2017-07-26-22-02-07.bpo-30119.DZ6C_S.rst D Misc/NEWS.d/next/Library/2017-07-31-19-32-57.bpo-29519._j1awg.rst D Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst D Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst D Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst D Misc/NEWS.d/next/Tests/2017-06-26-11-24-14.bpo-30283.qCQmlm.rst D Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst D Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst diff --git a/Misc/NEWS.d/2.7.14rc1.rst b/Misc/NEWS.d/2.7.14rc1.rst new file mode 100644 index 00000000000..462c03a9fc3 --- /dev/null +++ b/Misc/NEWS.d/2.7.14rc1.rst @@ -0,0 +1,149 @@ +.. bpo: 30947 +.. date: 2017-08-16-16-35-59 +.. nonce: iNMmm4 +.. release date: 2017-08-26 +.. section: Security + +Upgrade libexpat embedded copy from version 2.2.1 to 2.2.3 to get security +fixes. + +.. + +.. bpo: 30765 +.. date: 2017-06-26-14-29-50 +.. nonce: Q5iBmf +.. section: Core and Builtins + +Avoid blocking in pthread_mutex_lock() when PyThread_acquire_lock() is asked +not to block. + +.. + +.. bpo: 31135 +.. date: 2017-08-08-14-59-26 +.. nonce: 9q1QdB +.. section: Library + +ttk: Fix LabeledScale and OptionMenu destroy() method. Call the parent +destroy() method even if the used attribute doesn't exist. The +LabeledScale.destroy() method now also explicitly clears label and scale +attributes to help the garbage collector to destroy all widgets. + +.. + +.. bpo: 31107 +.. date: 2017-08-02-12-48-15 +.. nonce: 1t2hn5 +.. section: Library + +Fix `copy_reg._slotnames()` mangled attribute calculation for classes whose +name begins with an underscore. Patch by Shane Harvey. + +.. + +.. bpo: 29519 +.. date: 2017-07-31-19-32-57 +.. nonce: _j1awg +.. section: Library + +Fix weakref spewing exceptions during interpreter shutdown when used with a +rare combination of multiprocessing and custom codecs. + +.. + +.. bpo: 30119 +.. date: 2017-07-26-22-02-07 +.. nonce: DZ6C_S +.. section: Library + +ftplib.FTP.putline() now throws ValueError on commands that contains CR or +LF. Patch by Dong-hee Na. + +.. + +.. bpo: 30595 +.. date: 2017-07-26-04-46-12 +.. nonce: -zJ7d8 +.. section: Library + +multiprocessing.Queue.get() with a timeout now polls its reader in non- +blocking mode if it succeeded to aquire the lock but the acquire took longer +than the timeout. + +.. + +.. bpo: 29902 +.. date: 2017-07-23-13-47-22 +.. nonce: CiuFdn +.. section: Library + +Py3k deprecation warning now is emitted when pickling or copying some +builtin and extension objects that don't support pickling explicitly and are +pickled incorrectly by default (like memoryview or staticmethod). This is a +TypeError in Python 3.6. + +.. + +.. bpo: 29854 +.. date: 2017-07-07-02-18-57 +.. nonce: J8wKb_ +.. section: Library + +Fix segfault in readline when using readline's history-size option. Patch +by Nir Soffer. + +.. + +.. bpo: 30807 +.. date: 2017-06-29-22-04-44 +.. nonce: sLtjY- +.. section: Library + +signal.setitimer() may disable the timer when passed a tiny value. + +Tiny values (such as 1e-6) are valid non-zero values for setitimer(), which +is specified as taking microsecond-resolution intervals. However, on some +platform, our conversion routine could convert 1e-6 into a zero interval, +therefore disabling the timer instead of (re-)scheduling it. + +.. + +.. bpo: 30715 +.. date: 2017-07-25-15-27-44 +.. nonce: Sp7bTF +.. section: Tests + +Address ALPN callback changes for OpenSSL 1.1.0f. The latest version behaves +like OpenSSL 1.0.2 and no longer aborts handshake. + +.. + +.. bpo: 30822 +.. date: 2017-07-20-14-29-54 +.. nonce: X0wREo +.. section: Tests + +Fix regrtest command line parser to allow passing -u extralargefile to run +test_zipfile64. + +.. + +.. bpo: 30283 +.. date: 2017-06-26-11-24-14 +.. nonce: qCQmlm +.. section: Tests + +regrtest: Enhance regrtest and backport features from the master branch. + +Add options: --coverage, --testdir, --list-tests (list test files, don't run +them), --list-cases (list test identifiers, don't run them, :issue:`30523`), +--matchfile (load a list of test filters from a text file, :issue:`30540`), +--slowest (alias to --slow). + +Enhance output: add timestamp, test result, currently running tests, "Tests +result: xxx" summary with total duration, etc. + +Fix reference leak hunting in regrtest, --huntrleaks: regrtest now warms up +caches, create explicitly all internal singletons which are created on +demand to prevent false positives when checking for reference leaks. +(:issue:`30675`). diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-06-26-14-29-50.bpo-30765.Q5iBmf.rst b/Misc/NEWS.d/next/Core and Builtins/2017-06-26-14-29-50.bpo-30765.Q5iBmf.rst deleted file mode 100644 index 08d76cb965e..00000000000 --- a/Misc/NEWS.d/next/Core and Builtins/2017-06-26-14-29-50.bpo-30765.Q5iBmf.rst +++ /dev/null @@ -1,2 +0,0 @@ -Avoid blocking in pthread_mutex_lock() when PyThread_acquire_lock() is asked -not to block. diff --git a/Misc/NEWS.d/next/Library/2017-06-29-22-04-44.bpo-30807.sLtjY-.rst b/Misc/NEWS.d/next/Library/2017-06-29-22-04-44.bpo-30807.sLtjY-.rst deleted file mode 100644 index ce6f48a61f6..00000000000 --- a/Misc/NEWS.d/next/Library/2017-06-29-22-04-44.bpo-30807.sLtjY-.rst +++ /dev/null @@ -1,6 +0,0 @@ -signal.setitimer() may disable the timer when passed a tiny value. - -Tiny values (such as 1e-6) are valid non-zero values for setitimer(), which -is specified as taking microsecond-resolution intervals. However, on some -platform, our conversion routine could convert 1e-6 into a zero interval, -therefore disabling the timer instead of (re-)scheduling it. diff --git a/Misc/NEWS.d/next/Library/2017-07-07-02-18-57.bpo-29854.J8wKb_.rst b/Misc/NEWS.d/next/Library/2017-07-07-02-18-57.bpo-29854.J8wKb_.rst deleted file mode 100644 index 5c439087dcb..00000000000 --- a/Misc/NEWS.d/next/Library/2017-07-07-02-18-57.bpo-29854.J8wKb_.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fix segfault in readline when using readline's history-size option. Patch -by Nir Soffer. diff --git a/Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst b/Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst deleted file mode 100644 index 6aa6605be3e..00000000000 --- a/Misc/NEWS.d/next/Library/2017-07-23-13-47-22.bpo-29902.CiuFdn.rst +++ /dev/null @@ -1,4 +0,0 @@ -Py3k deprecation warning now is emitted when pickling or copying some builtin -and extension objects that don't support pickling explicitly and are pickled -incorrectly by default (like memoryview or staticmethod). This is a -TypeError in Python 3.6. diff --git a/Misc/NEWS.d/next/Library/2017-07-26-04-46-12.bpo-30595.-zJ7d8.rst b/Misc/NEWS.d/next/Library/2017-07-26-04-46-12.bpo-30595.-zJ7d8.rst deleted file mode 100644 index 4a2a3901cc6..00000000000 --- a/Misc/NEWS.d/next/Library/2017-07-26-04-46-12.bpo-30595.-zJ7d8.rst +++ /dev/null @@ -1,3 +0,0 @@ -multiprocessing.Queue.get() with a timeout now polls its reader in non- -blocking mode if it succeeded to aquire the lock but the acquire took longer -than the timeout. diff --git a/Misc/NEWS.d/next/Library/2017-07-26-22-02-07.bpo-30119.DZ6C_S.rst b/Misc/NEWS.d/next/Library/2017-07-26-22-02-07.bpo-30119.DZ6C_S.rst deleted file mode 100644 index a37d3703842..00000000000 --- a/Misc/NEWS.d/next/Library/2017-07-26-22-02-07.bpo-30119.DZ6C_S.rst +++ /dev/null @@ -1,2 +0,0 @@ -ftplib.FTP.putline() now throws ValueError on commands that contains CR or -LF. Patch by Dong-hee Na. diff --git a/Misc/NEWS.d/next/Library/2017-07-31-19-32-57.bpo-29519._j1awg.rst b/Misc/NEWS.d/next/Library/2017-07-31-19-32-57.bpo-29519._j1awg.rst deleted file mode 100644 index 9b2e39d3318..00000000000 --- a/Misc/NEWS.d/next/Library/2017-07-31-19-32-57.bpo-29519._j1awg.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fix weakref spewing exceptions during interpreter shutdown when used with a -rare combination of multiprocessing and custom codecs. diff --git a/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst b/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst deleted file mode 100644 index 09807058b4c..00000000000 --- a/Misc/NEWS.d/next/Library/2017-08-02-12-48-15.bpo-31107.1t2hn5.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fix `copy_reg._slotnames()` mangled attribute calculation for classes whose -name begins with an underscore. Patch by Shane Harvey. diff --git a/Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst b/Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst deleted file mode 100644 index 4d89633e126..00000000000 --- a/Misc/NEWS.d/next/Library/2017-08-08-14-59-26.bpo-31135.9q1QdB.rst +++ /dev/null @@ -1,4 +0,0 @@ -ttk: Fix LabeledScale and OptionMenu destroy() method. Call the parent -destroy() method even if the used attribute doesn't exist. The -LabeledScale.destroy() method now also explicitly clears label and scale -attributes to help the garbage collector to destroy all widgets. diff --git a/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst b/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst deleted file mode 100644 index 3caca9a79b4..00000000000 --- a/Misc/NEWS.d/next/Security/2017-08-16-16-35-59.bpo-30947.iNMmm4.rst +++ /dev/null @@ -1,2 +0,0 @@ -Upgrade libexpat embedded copy from version 2.2.1 to 2.2.3 to get security -fixes. diff --git a/Misc/NEWS.d/next/Tests/2017-06-26-11-24-14.bpo-30283.qCQmlm.rst b/Misc/NEWS.d/next/Tests/2017-06-26-11-24-14.bpo-30283.qCQmlm.rst deleted file mode 100644 index 528dc7a9231..00000000000 --- a/Misc/NEWS.d/next/Tests/2017-06-26-11-24-14.bpo-30283.qCQmlm.rst +++ /dev/null @@ -1,14 +0,0 @@ -regrtest: Enhance regrtest and backport features from the master branch. - -Add options: --coverage, --testdir, --list-tests (list test files, don't run -them), --list-cases (list test identifiers, don't run them, :issue:`30523`), ---matchfile (load a list of test filters from a text file, :issue:`30540`), ---slowest (alias to --slow). - -Enhance output: add timestamp, test result, currently running tests, "Tests -result: xxx" summary with total duration, etc. - -Fix reference leak hunting in regrtest, --huntrleaks: regrtest now warms up -caches, create explicitly all internal singletons which are created on demand -to prevent false positives when checking for reference leaks. -(:issue:`30675`). diff --git a/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst b/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst deleted file mode 100644 index ee0cf02c703..00000000000 --- a/Misc/NEWS.d/next/Tests/2017-07-20-14-29-54.bpo-30822.X0wREo.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fix regrtest command line parser to allow passing -u extralargefile to -run test_zipfile64. diff --git a/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst deleted file mode 100644 index 88394e585c5..00000000000 --- a/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst +++ /dev/null @@ -1,2 +0,0 @@ -Address ALPN callback changes for OpenSSL 1.1.0f. The latest version behaves -like OpenSSL 1.0.2 and no longer aborts handshake.

1 0

[3.6] bpo-30781: IDLE - use ttk widgets in configdialog (GH-2654) (#3214)
by Terry Jan Reedy 26 Aug '17

26 Aug '17

https://github.com/python/cpython/commit/7b556025ff7d663233e7fcb84785eb071f… commit: 7b556025ff7d663233e7fcb84785eb071f5e2ba7 branch: 3.6 author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-08-26T16:12:14-04:00 summary: [3.6] bpo-30781: IDLE - use ttk widgets in configdialog (GH-2654) (#3214) Patch by Cheryl Sabella. (cherry picked from commit 7028e59) files: M Lib/idlelib/configdialog.py M Lib/idlelib/idle_test/test_configdialog.py M Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index 81ea8afbbcd..ff7b638b51f 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -9,13 +9,13 @@ Refer to comments in EditorWindow autoindent code for details. """ -from tkinter import (Toplevel, Frame, LabelFrame, Listbox, Label, Button, - Entry, Text, Scale, Radiobutton, Checkbutton, Canvas, +from tkinter import (Toplevel, Listbox, Text, Scale, Canvas, StringVar, BooleanVar, IntVar, TRUE, FALSE, TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, NORMAL, DISABLED, NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW, HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END) -from tkinter.ttk import Notebook, Scrollbar +from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame, + Notebook, Radiobutton, Scrollbar, Style) import tkinter.colorchooser as tkColorChooser import tkinter.font as tkFont import tkinter.messagebox as tkMessageBox @@ -137,9 +137,9 @@ def create_action_buttons(self): # text in the buttons. padding_args = {} else: - padding_args = {'padx':6, 'pady':3} - outer = Frame(self, pady=2) - buttons = Frame(outer, pady=2) + padding_args = {'padding': (6, 3)} + outer = Frame(self, padding=2) + buttons = Frame(outer, padding=2) for txt, cmd in ( ('Ok', self.ok), ('Apply', self.apply), @@ -266,7 +266,7 @@ def create_page_extensions(self): self.extension_list.grid(column=0, row=0, sticky='nws') scroll.grid(column=1, row=0, sticky='ns') self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0]) - frame.configure(padx=10, pady=10) + frame.configure(padding=10) self.config_frame = {} self.current_extension = None @@ -356,9 +356,8 @@ def create_extension_frame(self, ext_name): label.grid(row=row, column=0, sticky=NW) var = opt['var'] if opt['type'] == 'bool': - Checkbutton(entry_area, textvariable=var, variable=var, - onvalue='True', offvalue='False', - indicatoron=FALSE, selectcolor='', width=8 + Checkbutton(entry_area, variable=var, + onvalue='True', offvalue='False', width=8 ).grid(row=row, column=1, sticky=W, padx=7) elif opt['type'] == 'int': Entry(entry_area, textvariable=var, validate='key', @@ -635,6 +634,7 @@ class HighPage(Frame): def __init__(self, master): super().__init__(master) self.cd = master.master + self.style = Style(master) self.create_page_highlight() self.load_theme_cfg() @@ -821,12 +821,14 @@ def tem(event, elem=element): self.highlight_target.set(elem) text.tag_bind( self.theme_elements[element][0], '<ButtonPress-1>', tem) - text['state'] = DISABLED - self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1) + text['state'] = 'disabled' + self.style.configure('frame_color_set.TFrame', borderwidth=1, + relief='solid') + self.frame_color_set = Frame(frame_custom, style='frame_color_set.TFrame') frame_fg_bg_toggle = Frame(frame_custom) self.button_set_color = Button( self.frame_color_set, text='Choose Color for :', - command=self.get_color, highlightthickness=0) + command=self.get_color) self.targetlist = DynOptionMenu( self.frame_color_set, self.highlight_target, None, highlightthickness=0) #, command=self.set_highlight_targetBinding @@ -855,7 +857,7 @@ def tem(event, elem=element): self.button_delete_custom = Button( frame_theme, text='Delete Custom Theme', command=self.delete_custom) - self.theme_message = Label(frame_theme, bd=2) + self.theme_message = Label(frame_theme, borderwidth=2) # Pack widgets: # body. @@ -913,7 +915,7 @@ def load_theme_cfg(self): item_list = idleConf.GetSectionList('user', 'highlight') item_list.sort() if not item_list: - self.custom_theme_on['state'] = DISABLED + self.custom_theme_on.state(('disabled',)) self.custom_name.set('- no custom themes -') else: self.customlist.SetMenu(item_list, item_list[0]) @@ -945,12 +947,10 @@ def var_changed_builtin_name(self, *params): changes.add_option('main', 'Theme', 'name', old_themes[0]) changes.add_option('main', 'Theme', 'name2', value) self.theme_message['text'] = 'New theme, see Help' - self.theme_message['fg'] = '#500000' else: changes.add_option('main', 'Theme', 'name', value) changes.add_option('main', 'Theme', 'name2', '') self.theme_message['text'] = '' - self.theme_message['fg'] = 'black' self.paint_theme_sample() def var_changed_custom_name(self, *params): @@ -1004,14 +1004,14 @@ def set_theme_type(self): load_theme_cfg """ if self.theme_source.get(): - self.builtinlist['state'] = NORMAL - self.customlist['state'] = DISABLED - self.button_delete_custom['state'] = DISABLED + self.builtinlist['state'] = 'normal' + self.customlist['state'] = 'disabled' + self.button_delete_custom.state(('disabled',)) else: - self.builtinlist['state'] = DISABLED - self.custom_theme_on['state'] = NORMAL - self.customlist['state'] = NORMAL - self.button_delete_custom['state'] = NORMAL + self.builtinlist['state'] = 'disabled' + self.custom_theme_on.state(('!disabled',)) + self.customlist['state'] = 'normal' + self.button_delete_custom.state(('!disabled',)) def get_color(self): """Handle button to select a new color for the target tag. @@ -1032,7 +1032,8 @@ def get_color(self): create_new """ target = self.highlight_target.get() - prev_color = self.frame_color_set.cget('bg') + prev_color = self.style.lookup(self.frame_color_set['style'], + 'background') rgbTuplet, color_string = tkColorChooser.askcolor( parent=self, title='Pick new color for : '+target, initialcolor=prev_color) @@ -1053,7 +1054,7 @@ def get_color(self): def on_new_color_set(self): "Display sample of new color selection on the dialog." new_color = self.color.get() - self.frame_color_set['bg'] = new_color # Set sample. + self.style.configure('frame_color_set.TFrame', background=new_color) plane = 'foreground' if self.fg_bg_toggle.get() else 'background' sample_element = self.theme_elements[self.highlight_target.get()][0] self.highlight_sample.tag_config(sample_element, **{plane: new_color}) @@ -1139,12 +1140,12 @@ def set_highlight_target(self): load_theme_cfg """ if self.highlight_target.get() == 'Cursor': # bg not possible - self.fg_on['state'] = DISABLED - self.bg_on['state'] = DISABLED + self.fg_on.state(('disabled',)) + self.bg_on.state(('disabled',)) self.fg_bg_toggle.set(1) else: # Both fg and bg can be set. - self.fg_on['state'] = NORMAL - self.bg_on['state'] = NORMAL + self.fg_on.state(('!disabled',)) + self.bg_on.state(('!disabled',)) self.fg_bg_toggle.set(1) self.set_color_sample() @@ -1172,7 +1173,7 @@ def set_color_sample(self): tag = self.theme_elements[self.highlight_target.get()][0] plane = 'foreground' if self.fg_bg_toggle.get() else 'background' color = self.highlight_sample.tag_cget(tag, plane) - self.frame_color_set['bg'] = color + self.style.configure('frame_color_set.TFrame', background=color) def paint_theme_sample(self): """Apply the theme colors to each element tag in the sample text. @@ -1260,7 +1261,7 @@ def delete_custom(self): item_list = idleConf.GetSectionList('user', 'highlight') item_list.sort() if not item_list: - self.custom_theme_on['state'] = DISABLED + self.custom_theme_on.state(('disabled',)) self.customlist.SetMenu(item_list, '- no custom themes -') else: self.customlist.SetMenu(item_list, item_list[0]) @@ -1397,7 +1398,7 @@ def create_page_keys(self): frame_custom, text='Get New Keys for Selection', command=self.get_new_keys, state=DISABLED) # frame_key_sets. - frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0) + frames = [Frame(frame_key_sets, padding=2, borderwidth=0) for i in range(2)] self.builtin_keyset_on = Radiobutton( frames[0], variable=self.keyset_source, value=1, @@ -1415,7 +1416,7 @@ def create_page_keys(self): self.button_save_custom_keys = Button( frames[1], text='Save as New Custom Key Set', command=self.save_as_new_key_set) - self.keys_message = Label(frames[0], bd=2) + self.keys_message = Label(frames[0], borderwidth=2) # Pack widgets: # body. @@ -1457,7 +1458,7 @@ def load_key_cfg(self): item_list = idleConf.GetSectionList('user', 'keys') item_list.sort() if not item_list: - self.custom_keyset_on['state'] = DISABLED + self.custom_keyset_on.state(('disabled',)) self.custom_name.set('- no custom keys -') else: self.customlist.SetMenu(item_list, item_list[0]) @@ -1487,12 +1488,10 @@ def var_changed_builtin_name(self, *params): changes.add_option('main', 'Keys', 'name', old_keys[0]) changes.add_option('main', 'Keys', 'name2', value) self.keys_message['text'] = 'New key set, see Help' - self.keys_message['fg'] = '#500000' else: changes.add_option('main', 'Keys', 'name', value) changes.add_option('main', 'Keys', 'name2', '') self.keys_message['text'] = '' - self.keys_message['fg'] = 'black' self.load_keys_list(value) def var_changed_custom_name(self, *params): @@ -1526,14 +1525,14 @@ def var_changed_keybinding(self, *params): def set_keys_type(self): "Set available screen options based on builtin or custom key set." if self.keyset_source.get(): - self.builtinlist['state'] = NORMAL - self.customlist['state'] = DISABLED - self.button_delete_custom_keys['state'] = DISABLED + self.builtinlist['state'] = 'normal' + self.customlist['state'] = 'disabled' + self.button_delete_custom_keys.state(('disabled',)) else: - self.builtinlist['state'] = DISABLED - self.custom_keyset_on['state'] = NORMAL - self.customlist['state'] = NORMAL - self.button_delete_custom_keys['state'] = NORMAL + self.builtinlist['state'] = 'disabled' + self.custom_keyset_on.state(('!disabled',)) + self.customlist['state'] = 'normal' + self.button_delete_custom_keys.state(('!disabled',)) def get_new_keys(self): """Handle event to change key binding for selected line. @@ -1595,7 +1594,7 @@ def save_as_new_key_set(self): def on_bindingslist_select(self, event): "Activate button to assign new keys to selected action." - self.button_new_keys['state'] = NORMAL + self.button_new_keys.state(('!disabled',)) def create_new_key_set(self, new_key_set_name): """Create a new custom key set with the given name. @@ -1689,7 +1688,7 @@ def delete_custom_keys(self): item_list = idleConf.GetSectionList('user', 'keys') item_list.sort() if not item_list: - self.custom_keyset_on['state'] = DISABLED + self.custom_keyset_on.state(('disabled',)) self.customlist.SetMenu(item_list, '- no custom keys -') else: self.customlist.SetMenu(item_list, item_list[0]) @@ -1809,13 +1808,13 @@ def create_page_general(self): self.helplist['yscrollcommand'] = scroll_helplist.set self.helplist.bind('<ButtonRelease-1>', self.help_source_selected) self.button_helplist_edit = Button( - frame_helplist_buttons, text='Edit', state=DISABLED, + frame_helplist_buttons, text='Edit', state='disabled', width=8, command=self.helplist_item_edit) self.button_helplist_add = Button( frame_helplist_buttons, text='Add', width=8, command=self.helplist_item_add) self.button_helplist_remove = Button( - frame_helplist_buttons, text='Remove', state=DISABLED, + frame_helplist_buttons, text='Remove', state='disabled', width=8, command=self.helplist_item_remove) # Pack widgets: @@ -1874,15 +1873,15 @@ def help_source_selected(self, event): def set_add_delete_state(self): "Toggle the state for the help list buttons based on list entries." if self.helplist.size() < 1: # No entries in list. - self.button_helplist_edit['state'] = DISABLED - self.button_helplist_remove['state'] = DISABLED + self.button_helplist_edit.state(('disabled',)) + self.button_helplist_remove.state(('disabled',)) else: # Some entries. if self.helplist.curselection(): # There currently is a selection. - self.button_helplist_edit['state'] = NORMAL - self.button_helplist_remove['state'] = NORMAL + self.button_helplist_edit.state(('!disabled',)) + self.button_helplist_remove.state(('!disabled',)) else: # There currently is not a selection. - self.button_helplist_edit['state'] = DISABLED - self.button_helplist_remove['state'] = DISABLED + self.button_helplist_edit.state(('disabled',)) + self.button_helplist_remove.state(('disabled',)) def helplist_item_add(self): """Handle add button for the help list. @@ -2062,7 +2061,7 @@ def __init__(self, parent, *args, **kw): # Create a canvas object and a vertical scrollbar for scrolling it. vscrollbar = Scrollbar(self, orient=VERTICAL) vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE) - canvas = Canvas(self, bd=0, highlightthickness=0, + canvas = Canvas(self, borderwidth=0, highlightthickness=0, yscrollcommand=vscrollbar.set, width=240) canvas.pack(side=LEFT, fill=BOTH, expand=TRUE) vscrollbar.config(command=canvas.yview) diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py index df801c32b73..c947da1866e 100644 --- a/Lib/idlelib/idle_test/test_configdialog.py +++ b/Lib/idlelib/idle_test/test_configdialog.py @@ -272,7 +272,7 @@ def test_load_theme_cfg(self): # builtinlist sets variable builtin_name to the CurrentTheme default. eq(d.builtin_name.get(), 'IDLE Classic') eq(d.custom_name.get(), '- no custom themes -') - eq(d.custom_theme_on['state'], DISABLED) + eq(d.custom_theme_on.state(), ('disabled',)) eq(d.set_theme_type.called, 1) eq(d.paint_theme_sample.called, 1) eq(d.set_highlight_target.called, 1) @@ -315,7 +315,7 @@ def test_theme_source(self): changes.clear() # Custom selected. - d.custom_theme_on['state'] = NORMAL + d.custom_theme_on.state(('!disabled',)) d.custom_theme_on.invoke() self.assertEqual(mainpage, {'Theme': {'default': 'False'}}) eq(d.var_changed_builtin_name.called, 1) @@ -428,15 +428,15 @@ def test_set_theme_type(self): d.set_theme_type() eq(d.builtinlist['state'], NORMAL) eq(d.customlist['state'], DISABLED) - eq(d.button_delete_custom['state'], DISABLED) + eq(d.button_delete_custom.state(), ('disabled',)) # Custom theme selected. d.theme_source.set(False) d.set_theme_type() eq(d.builtinlist['state'], DISABLED) - eq(d.custom_theme_on['state'], NORMAL) + eq(d.custom_theme_on.state(), ('selected',)) eq(d.customlist['state'], NORMAL) - eq(d.button_delete_custom['state'], NORMAL) + eq(d.button_delete_custom.state(), ()) d.set_theme_type = Func() def test_get_color(self): @@ -455,7 +455,7 @@ def test_get_color(self): eq(d.color.get(), '#ffffff') # Selection same as previous color. - chooser.result = ('', d.frame_color_set.cget('bg')) + chooser.result = ('', d.style.lookup(d.frame_color_set['style'], 'background')) d.button_set_color.invoke() eq(d.color.get(), '#ffffff') @@ -494,7 +494,7 @@ def test_on_new_color_set(self): d.fg_bg_toggle.set(True) d.color.set(color) - self.assertEqual(d.frame_color_set.cget('bg'), color) + self.assertEqual(d.style.lookup(d.frame_color_set['style'], 'background'), color) self.assertEqual(d.highlight_sample.tag_cget('hilite', 'foreground'), color) self.assertEqual(highpage, {'Python': {'hilite-foreground': color}}) @@ -567,15 +567,15 @@ def test_set_highlight_target(self): # Target is cursor. d.highlight_target.set('Cursor') - eq(d.fg_on['state'], DISABLED) - eq(d.bg_on['state'], DISABLED) + eq(d.fg_on.state(), ('disabled', 'selected')) + eq(d.bg_on.state(), ('disabled',)) self.assertTrue(d.fg_bg_toggle) eq(d.set_color_sample.called, 1) # Target is not cursor. d.highlight_target.set('Comment') - eq(d.fg_on['state'], NORMAL) - eq(d.bg_on['state'], NORMAL) + eq(d.fg_on.state(), ('selected',)) + eq(d.bg_on.state(), ()) self.assertTrue(d.fg_bg_toggle) eq(d.set_color_sample.called, 2) @@ -597,8 +597,9 @@ def test_set_color_sample(self): d.highlight_target.set('Selected Text') d.fg_bg_toggle.set(True) d.set_color_sample() - self.assertEqual(d.frame_color_set.cget('bg'), - d.highlight_sample.tag_cget('hilite', 'foreground')) + self.assertEqual( + d.style.lookup(d.frame_color_set['style'], 'background'), + d.highlight_sample.tag_cget('hilite', 'foreground')) d.set_color_sample = Func() def test_paint_theme_sample(self): @@ -641,7 +642,7 @@ def test_paint_theme_sample(self): def test_delete_custom(self): eq = self.assertEqual d = self.page - d.button_delete_custom['state'] = NORMAL + d.button_delete_custom.state(('!disabled',)) yesno = configdialog.tkMessageBox.askyesno = Func() dialog.deactivate_current_config = Func() dialog.activate_config_changes = Func() @@ -670,7 +671,7 @@ def test_delete_custom(self): eq(yesno.called, 2) self.assertNotIn(theme_name, highpage) eq(idleConf.GetSectionList('user', 'highlight'), []) - eq(d.custom_theme_on['state'], DISABLED) + eq(d.custom_theme_on.state(), ('disabled',)) eq(d.custom_name.get(), '- no custom themes -') eq(dialog.deactivate_current_config.called, 1) eq(dialog.activate_config_changes.called, 1) @@ -721,7 +722,7 @@ def test_load_key_cfg(self): # builtinlist sets variable builtin_name to the CurrentKeys default. eq(d.builtin_name.get(), 'IDLE Classic OSX') eq(d.custom_name.get(), '- no custom keys -') - eq(d.custom_keyset_on['state'], DISABLED) + eq(d.custom_keyset_on.state(), ('disabled',)) eq(d.set_keys_type.called, 1) eq(d.load_keys_list.called, 1) eq(d.load_keys_list.args, ('IDLE Classic OSX', )) @@ -765,7 +766,7 @@ def test_keyset_source(self): changes.clear() # Custom selected. - d.custom_keyset_on['state'] = NORMAL + d.custom_keyset_on.state(('!disabled',)) d.custom_keyset_on.invoke() self.assertEqual(mainpage, {'Keys': {'default': 'False'}}) eq(d.var_changed_builtin_name.called, 1) @@ -847,15 +848,15 @@ def test_set_keys_type(self): d.set_keys_type() eq(d.builtinlist['state'], NORMAL) eq(d.customlist['state'], DISABLED) - eq(d.button_delete_custom_keys['state'], DISABLED) + eq(d.button_delete_custom_keys.state(), ('disabled',)) # Custom keyset selected. d.keyset_source.set(False) d.set_keys_type() eq(d.builtinlist['state'], DISABLED) - eq(d.custom_keyset_on['state'], NORMAL) + eq(d.custom_keyset_on.state(), ('selected',)) eq(d.customlist['state'], NORMAL) - eq(d.button_delete_custom_keys['state'], NORMAL) + eq(d.button_delete_custom_keys.state(), ()) d.set_keys_type = Func() def test_get_new_keys(self): @@ -865,7 +866,7 @@ def test_get_new_keys(self): gkd = configdialog.GetKeysDialog = Func(return_self=True) gnkn = d.get_new_keys_name = Func() - d.button_new_keys['state'] = NORMAL + d.button_new_keys.state(('!disabled',)) d.bindingslist.delete(0, 'end') d.bindingslist.insert(0, 'copy - <Control-Shift-Key-C>') d.bindingslist.selection_set(0) @@ -953,7 +954,7 @@ def test_on_bindingslist_select(self): b.event_generate('<Button-1>', x=x, y=y) b.event_generate('<ButtonRelease-1>', x=x, y=y) self.assertEqual(b.get('anchor'), 'find') - self.assertEqual(d.button_new_keys['state'], NORMAL) + self.assertEqual(d.button_new_keys.state(), ()) def test_create_new_key_set_and_save_new_key_set(self): eq = self.assertEqual @@ -1032,7 +1033,7 @@ def test_load_keys_list(self): def test_delete_custom_keys(self): eq = self.assertEqual d = self.page - d.button_delete_custom_keys['state'] = NORMAL + d.button_delete_custom_keys.state(('!disabled',)) yesno = configdialog.tkMessageBox.askyesno = Func() dialog.deactivate_current_config = Func() dialog.activate_config_changes = Func() @@ -1061,7 +1062,7 @@ def test_delete_custom_keys(self): eq(yesno.called, 2) self.assertNotIn(keyset_name, keyspage) eq(idleConf.GetSectionList('user', 'keys'), []) - eq(d.custom_keyset_on['state'], DISABLED) + eq(d.custom_keyset_on.state(), ('disabled',)) eq(d.custom_name.get(), '- no custom keys -') eq(dialog.deactivate_current_config.called, 1) eq(dialog.activate_config_changes.called, 1) @@ -1173,18 +1174,18 @@ def test_set_add_delete_state(self): h.delete(0, 'end') sad() - eq(d.button_helplist_edit['state'], DISABLED) - eq(d.button_helplist_remove['state'], DISABLED) + eq(d.button_helplist_edit.state(), ('disabled',)) + eq(d.button_helplist_remove.state(), ('disabled',)) h.insert(0, 'source') sad() - eq(d.button_helplist_edit['state'], DISABLED) - eq(d.button_helplist_remove['state'], DISABLED) + eq(d.button_helplist_edit.state(), ('disabled',)) + eq(d.button_helplist_remove.state(), ('disabled',)) h.selection_set(0) sad() - eq(d.button_helplist_edit['state'], NORMAL) - eq(d.button_helplist_remove['state'], NORMAL) + eq(d.button_helplist_edit.state(), ()) + eq(d.button_helplist_remove.state(), ()) d.set_add_delete_state = Func() # Mask method. def test_helplist_item_add(self): diff --git a/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst b/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst index 18f40a41f29..3031adff717 100644 --- a/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst +++ b/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst @@ -1 +1,2 @@ -IDLE - Use ttk Notebook in ConfigDialog +IDLE - Use ttk widgets in ConfigDialog. +Patches by Terry Jan Reedy and Cheryl Sabella.

1 0

[2.7] bpo-28261: Prevent raising SystemError where PyArg_ParseTuple is used to parse non-args. (#3213)
by Serhiy Storchaka 26 Aug '17

26 Aug '17

https://github.com/python/cpython/commit/bc80fd1bd2e8b6817accbc101e7fe5e50b… commit: bc80fd1bd2e8b6817accbc101e7fe5e50ba8f768 branch: 2.7 author: Oren Milman <orenmn(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-08-26T21:56:31+03:00 summary: [2.7] bpo-28261: Prevent raising SystemError where PyArg_ParseTuple is used to parse non-args. (#3213) files: M Lib/test/test_audioop.py M Modules/audioop.c diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py index 4af73500ea4..5f1deb57761 100644 --- a/Lib/test/test_audioop.py +++ b/Lib/test/test_audioop.py @@ -325,6 +325,10 @@ def test_ratecv(self): self.assertEqual(audioop.ratecv(datas[w], w, 1, 8000, 8000, None, 30, 10)[0], expected[w]) + self.assertRaises(TypeError, audioop.ratecv, b'', 1, 1, 8000, 8000, 42) + self.assertRaises(TypeError, audioop.ratecv, + b'', 1, 1, 8000, 8000, (1, (42,))) + def test_reverse(self): for w in 1, 2, 4: self.assertEqual(audioop.reverse(b'', w), b'') diff --git a/Modules/audioop.c b/Modules/audioop.c index a4d13753b61..ad7336c7f9e 100644 --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -1086,7 +1086,7 @@ audioop_ratecv(PyObject *self, PyObject *args) char *cp, *ncp; int len, size, nchannels, inrate, outrate, weightA, weightB; int chan, d, *prev_i, *cur_i, cur_o; - PyObject *state, *samps, *str, *rv = NULL; + PyObject *state, *samps, *str, *rv = NULL, *channel; int bytes_per_frame; weightA = 1; @@ -1152,6 +1152,10 @@ audioop_ratecv(PyObject *self, PyObject *args) prev_i[chan] = cur_i[chan] = 0; } else { + if (!PyTuple_Check(state)) { + PyErr_SetString(PyExc_TypeError, "state must be a tuple or None"); + goto exit; + } if (!PyArg_ParseTuple(state, "iO!;audioop.ratecv: illegal state argument", &d, &PyTuple_Type, &samps)) @@ -1162,7 +1166,13 @@ audioop_ratecv(PyObject *self, PyObject *args) goto exit; } for (chan = 0; chan < nchannels; chan++) { - if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan), + channel = PyTuple_GetItem(samps, chan); + if (!PyTuple_Check(channel)) { + PyErr_SetString(PyExc_TypeError, + "ratecv(): illegal state argument"); + goto exit; + } + if (!PyArg_ParseTuple(channel, "ii:ratecv", &prev_i[chan], &cur_i[chan])) goto exit;

1 0