Mailman 3 December 2018 - Python-checkins

bpo-35598: IDLE: Increase test coverage for config_key.py (GH-11360)
by Miss Islington (bot) Dec. 30, 2018

Dec. 30, 2018

https://github.com/python/cpython/commit/34aadec448f373b95653318e91f6f95935… commit: 34aadec448f373b95653318e91f6f959354ffa89 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-12-29T20:39:27-08:00 summary: bpo-35598: IDLE: Increase test coverage for config_key.py (GH-11360) (cherry picked from commit b0a6196ffd58ff91462191f426706897dc920eee) Co-authored-by: Cheryl Sabella <cheryl.sabella(a)gmail.com> files: M Lib/idlelib/config_key.py M Lib/idlelib/idle_test/test_config_key.py M Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst diff --git a/Lib/idlelib/config_key.py b/Lib/idlelib/config_key.py index 4b0232300f23..4e7b38b75a1d 100644 --- a/Lib/idlelib/config_key.py +++ b/Lib/idlelib/config_key.py @@ -67,7 +67,7 @@ def showerror(self, *args, **kwargs): messagebox.showerror(*args, **kwargs) def create_widgets(self): - frame = Frame(self, borderwidth=2, relief=SUNKEN) + self.frame = frame = Frame(self, borderwidth=2, relief=SUNKEN) frame.pack(side=TOP, expand=True, fill=BOTH) frame_buttons = Frame(self) @@ -81,7 +81,7 @@ def create_widgets(self): self.button_cancel.grid(row=0, column=1, padx=5, pady=5) # Basic entry key sequence. - self.frame_keyseq_basic = Frame(frame) + self.frame_keyseq_basic = Frame(frame, name='keyseq_basic') self.frame_keyseq_basic.grid(row=0, column=0, sticky=NSEW, padx=5, pady=5) basic_title = Label(self.frame_keyseq_basic, @@ -135,7 +135,7 @@ def create_widgets(self): self.button_clear.grid(row=2, column=0, columnspan=4) # Advanced entry key sequence. - self.frame_keyseq_advanced = Frame(frame) + self.frame_keyseq_advanced = Frame(frame, name='keyseq_advanced') self.frame_keyseq_advanced.grid(row=0, column=0, sticky=NSEW, padx=5, pady=5) advanced_title = Label(self.frame_keyseq_advanced, justify=LEFT, @@ -197,7 +197,7 @@ def toggle_level(self): self.frame_controls_basic.lift() self.advanced = False - def final_key_selected(self, event): + def final_key_selected(self, event=None): "Handler for clicking on key in basic settings list." self.build_key_string() diff --git a/Lib/idlelib/idle_test/test_config_key.py b/Lib/idlelib/idle_test/test_config_key.py index adf02c98361c..9412b22c2c87 100644 --- a/Lib/idlelib/idle_test/test_config_key.py +++ b/Lib/idlelib/idle_test/test_config_key.py @@ -1,17 +1,25 @@ -"Test config_key, coverage 82%" +"""Test config_key, coverage 98%. + +Coverage is effectively 100%. Tkinter dialog is mocked, Mac-only line +may be skipped, and dummy function in bind test should not be called. +Not tested: exit with 'self.advanced or self.keys_ok(keys)) ...' False. +""" from idlelib import config_key from test.support import requires import unittest -from tkinter import Tk +from unittest import mock +from tkinter import Tk, TclError from idlelib.idle_test.mock_idle import Func from idlelib.idle_test.mock_tk import Mbox_func +gkd = config_key.GetKeysDialog + class ValidationTest(unittest.TestCase): "Test validation methods: ok, keys_ok, bind_ok." - class Validator(config_key.GetKeysDialog): + class Validator(gkd): def __init__(self, *args, **kwargs): config_key.GetKeysDialog.__init__(self, *args, **kwargs) class list_keys_final: @@ -95,5 +103,186 @@ def test_bind_not_ok(self): self.assertIn('not accepted', self.dialog.showerror.message) +class ToggleLevelTest(unittest.TestCase): + "Test toggle between Basic and Advanced frames." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = gkd(cls.root, 'Title', '<<Test>>', [], _utest=True) + + @classmethod + def tearDownClass(cls): + cls.dialog.cancel() + cls.root.update_idletasks() + cls.root.destroy() + del cls.dialog, cls.root + + def test_toggle_level(self): + dialog = self.dialog + + def stackorder(): + """Get the stack order of the children of the frame. + + winfo_children() stores the children in stack order, so + this can be used to check whether a frame is above or + below another one. + """ + for index, child in enumerate(dialog.frame.winfo_children()): + if child._name == 'keyseq_basic': + basic = index + if child._name == 'keyseq_advanced': + advanced = index + return basic, advanced + + # New window starts at basic level. + self.assertFalse(dialog.advanced) + self.assertIn('Advanced', dialog.button_level['text']) + basic, advanced = stackorder() + self.assertGreater(basic, advanced) + + # Toggle to advanced. + dialog.toggle_level() + self.assertTrue(dialog.advanced) + self.assertIn('Basic', dialog.button_level['text']) + basic, advanced = stackorder() + self.assertGreater(advanced, basic) + + # Toggle to basic. + dialog.button_level.invoke() + self.assertFalse(dialog.advanced) + self.assertIn('Advanced', dialog.button_level['text']) + basic, advanced = stackorder() + self.assertGreater(basic, advanced) + + +class KeySelectionTest(unittest.TestCase): + "Test selecting key on Basic frames." + + class Basic(gkd): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + class list_keys_final: + get = Func() + select_clear = Func() + yview = Func() + self.list_keys_final = list_keys_final + def set_modifiers_for_platform(self): + self.modifiers = ['foo', 'bar', 'BAZ'] + self.modifier_label = {'BAZ': 'ZZZ'} + showerror = Mbox_func() + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = cls.Basic(cls.root, 'Title', '<<Test>>', [], _utest=True) + + @classmethod + def tearDownClass(cls): + cls.dialog.cancel() + cls.root.update_idletasks() + cls.root.destroy() + del cls.dialog, cls.root + + def setUp(self): + self.dialog.clear_key_seq() + + def test_get_modifiers(self): + dialog = self.dialog + gm = dialog.get_modifiers + eq = self.assertEqual + + # Modifiers are set by selecting/deselecting the checkbutton. + dialog.modifier_checkbuttons['foo'].select() + eq(gm(), ['foo']) + + dialog.modifier_checkbuttons['BAZ'].select() + eq(gm(), ['foo', 'BAZ']) + + dialog.modifier_checkbuttons['foo'].deselect() + eq(gm(), ['BAZ']) + + def test_translate_key(self): + dialog = self.dialog + tr = dialog.translate_key + eq = self.assertEqual + + # Letters return unchanged with no 'Shift'. + eq(tr('q', []), 'Key-q') + eq(tr('q', ['Control', 'Alt']), 'Key-q') + + # 'Shift' uppercases single lowercase letters. + eq(tr('q', ['Shift']), 'Key-Q') + eq(tr('q', ['Control', 'Shift']), 'Key-Q') + eq(tr('q', ['Control', 'Alt', 'Shift']), 'Key-Q') + + # Convert key name to keysym. + eq(tr('Page Up', []), 'Key-Prior') + # 'Shift' doesn't change case. + eq(tr('Page Down', ['Shift']), 'Key-Next') + + @mock.patch.object(gkd, 'get_modifiers') + def test_build_key_string(self, mock_modifiers): + dialog = self.dialog + key = dialog.list_keys_final + string = dialog.key_string.get + eq = self.assertEqual + + key.get.result = 'a' + mock_modifiers.return_value = [] + dialog.build_key_string() + eq(string(), '<Key-a>') + + mock_modifiers.return_value = ['mymod'] + dialog.build_key_string() + eq(string(), '<mymod-Key-a>') + + key.get.result = '' + mock_modifiers.return_value = ['mymod', 'test'] + dialog.build_key_string() + eq(string(), '<mymod-test>') + + @mock.patch.object(gkd, 'get_modifiers') + def test_final_key_selected(self, mock_modifiers): + dialog = self.dialog + key = dialog.list_keys_final + string = dialog.key_string.get + eq = self.assertEqual + + mock_modifiers.return_value = ['Shift'] + key.get.result = '{' + dialog.final_key_selected() + eq(string(), '<Shift-Key-braceleft>') + + +class CancelTest(unittest.TestCase): + "Simulate user clicking [Cancel] button." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = gkd(cls.root, 'Title', '<<Test>>', [], _utest=True) + + @classmethod + def tearDownClass(cls): + cls.dialog.cancel() + cls.root.update_idletasks() + cls.root.destroy() + del cls.dialog, cls.root + + def test_cancel(self): + self.assertEqual(self.dialog.winfo_class(), 'Toplevel') + self.dialog.button_cancel.invoke() + with self.assertRaises(TclError): + self.dialog.winfo_class() + self.assertEqual(self.dialog.result, '') + + if __name__ == '__main__': unittest.main(verbosity=2) diff --git a/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst b/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst index 54347c58f93d..6cc3557b5190 100644 --- a/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst +++ b/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst @@ -1 +1 @@ -Apply PEP8 naming convention to config_key.py. +Update config_key: use PEP 8 names and add tests.

1 0

bpo-35598: IDLE: Increase test coverage for config_key.py (#11360)
by Terry Jan Reedy Dec. 30, 2018

Dec. 30, 2018

https://github.com/python/cpython/commit/b0a6196ffd58ff91462191f426706897dc… commit: b0a6196ffd58ff91462191f426706897dc920eee branch: master author: Cheryl Sabella <cheryl.sabella(a)gmail.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2018-12-29T23:25:09-05:00 summary: bpo-35598: IDLE: Increase test coverage for config_key.py (#11360) files: M Lib/idlelib/config_key.py M Lib/idlelib/idle_test/test_config_key.py M Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst diff --git a/Lib/idlelib/config_key.py b/Lib/idlelib/config_key.py index 4b0232300f23..4e7b38b75a1d 100644 --- a/Lib/idlelib/config_key.py +++ b/Lib/idlelib/config_key.py @@ -67,7 +67,7 @@ def showerror(self, *args, **kwargs): messagebox.showerror(*args, **kwargs) def create_widgets(self): - frame = Frame(self, borderwidth=2, relief=SUNKEN) + self.frame = frame = Frame(self, borderwidth=2, relief=SUNKEN) frame.pack(side=TOP, expand=True, fill=BOTH) frame_buttons = Frame(self) @@ -81,7 +81,7 @@ def create_widgets(self): self.button_cancel.grid(row=0, column=1, padx=5, pady=5) # Basic entry key sequence. - self.frame_keyseq_basic = Frame(frame) + self.frame_keyseq_basic = Frame(frame, name='keyseq_basic') self.frame_keyseq_basic.grid(row=0, column=0, sticky=NSEW, padx=5, pady=5) basic_title = Label(self.frame_keyseq_basic, @@ -135,7 +135,7 @@ def create_widgets(self): self.button_clear.grid(row=2, column=0, columnspan=4) # Advanced entry key sequence. - self.frame_keyseq_advanced = Frame(frame) + self.frame_keyseq_advanced = Frame(frame, name='keyseq_advanced') self.frame_keyseq_advanced.grid(row=0, column=0, sticky=NSEW, padx=5, pady=5) advanced_title = Label(self.frame_keyseq_advanced, justify=LEFT, @@ -197,7 +197,7 @@ def toggle_level(self): self.frame_controls_basic.lift() self.advanced = False - def final_key_selected(self, event): + def final_key_selected(self, event=None): "Handler for clicking on key in basic settings list." self.build_key_string() diff --git a/Lib/idlelib/idle_test/test_config_key.py b/Lib/idlelib/idle_test/test_config_key.py index adf02c98361c..9412b22c2c87 100644 --- a/Lib/idlelib/idle_test/test_config_key.py +++ b/Lib/idlelib/idle_test/test_config_key.py @@ -1,17 +1,25 @@ -"Test config_key, coverage 82%" +"""Test config_key, coverage 98%. + +Coverage is effectively 100%. Tkinter dialog is mocked, Mac-only line +may be skipped, and dummy function in bind test should not be called. +Not tested: exit with 'self.advanced or self.keys_ok(keys)) ...' False. +""" from idlelib import config_key from test.support import requires import unittest -from tkinter import Tk +from unittest import mock +from tkinter import Tk, TclError from idlelib.idle_test.mock_idle import Func from idlelib.idle_test.mock_tk import Mbox_func +gkd = config_key.GetKeysDialog + class ValidationTest(unittest.TestCase): "Test validation methods: ok, keys_ok, bind_ok." - class Validator(config_key.GetKeysDialog): + class Validator(gkd): def __init__(self, *args, **kwargs): config_key.GetKeysDialog.__init__(self, *args, **kwargs) class list_keys_final: @@ -95,5 +103,186 @@ def test_bind_not_ok(self): self.assertIn('not accepted', self.dialog.showerror.message) +class ToggleLevelTest(unittest.TestCase): + "Test toggle between Basic and Advanced frames." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = gkd(cls.root, 'Title', '<<Test>>', [], _utest=True) + + @classmethod + def tearDownClass(cls): + cls.dialog.cancel() + cls.root.update_idletasks() + cls.root.destroy() + del cls.dialog, cls.root + + def test_toggle_level(self): + dialog = self.dialog + + def stackorder(): + """Get the stack order of the children of the frame. + + winfo_children() stores the children in stack order, so + this can be used to check whether a frame is above or + below another one. + """ + for index, child in enumerate(dialog.frame.winfo_children()): + if child._name == 'keyseq_basic': + basic = index + if child._name == 'keyseq_advanced': + advanced = index + return basic, advanced + + # New window starts at basic level. + self.assertFalse(dialog.advanced) + self.assertIn('Advanced', dialog.button_level['text']) + basic, advanced = stackorder() + self.assertGreater(basic, advanced) + + # Toggle to advanced. + dialog.toggle_level() + self.assertTrue(dialog.advanced) + self.assertIn('Basic', dialog.button_level['text']) + basic, advanced = stackorder() + self.assertGreater(advanced, basic) + + # Toggle to basic. + dialog.button_level.invoke() + self.assertFalse(dialog.advanced) + self.assertIn('Advanced', dialog.button_level['text']) + basic, advanced = stackorder() + self.assertGreater(basic, advanced) + + +class KeySelectionTest(unittest.TestCase): + "Test selecting key on Basic frames." + + class Basic(gkd): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + class list_keys_final: + get = Func() + select_clear = Func() + yview = Func() + self.list_keys_final = list_keys_final + def set_modifiers_for_platform(self): + self.modifiers = ['foo', 'bar', 'BAZ'] + self.modifier_label = {'BAZ': 'ZZZ'} + showerror = Mbox_func() + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = cls.Basic(cls.root, 'Title', '<<Test>>', [], _utest=True) + + @classmethod + def tearDownClass(cls): + cls.dialog.cancel() + cls.root.update_idletasks() + cls.root.destroy() + del cls.dialog, cls.root + + def setUp(self): + self.dialog.clear_key_seq() + + def test_get_modifiers(self): + dialog = self.dialog + gm = dialog.get_modifiers + eq = self.assertEqual + + # Modifiers are set by selecting/deselecting the checkbutton. + dialog.modifier_checkbuttons['foo'].select() + eq(gm(), ['foo']) + + dialog.modifier_checkbuttons['BAZ'].select() + eq(gm(), ['foo', 'BAZ']) + + dialog.modifier_checkbuttons['foo'].deselect() + eq(gm(), ['BAZ']) + + def test_translate_key(self): + dialog = self.dialog + tr = dialog.translate_key + eq = self.assertEqual + + # Letters return unchanged with no 'Shift'. + eq(tr('q', []), 'Key-q') + eq(tr('q', ['Control', 'Alt']), 'Key-q') + + # 'Shift' uppercases single lowercase letters. + eq(tr('q', ['Shift']), 'Key-Q') + eq(tr('q', ['Control', 'Shift']), 'Key-Q') + eq(tr('q', ['Control', 'Alt', 'Shift']), 'Key-Q') + + # Convert key name to keysym. + eq(tr('Page Up', []), 'Key-Prior') + # 'Shift' doesn't change case. + eq(tr('Page Down', ['Shift']), 'Key-Next') + + @mock.patch.object(gkd, 'get_modifiers') + def test_build_key_string(self, mock_modifiers): + dialog = self.dialog + key = dialog.list_keys_final + string = dialog.key_string.get + eq = self.assertEqual + + key.get.result = 'a' + mock_modifiers.return_value = [] + dialog.build_key_string() + eq(string(), '<Key-a>') + + mock_modifiers.return_value = ['mymod'] + dialog.build_key_string() + eq(string(), '<mymod-Key-a>') + + key.get.result = '' + mock_modifiers.return_value = ['mymod', 'test'] + dialog.build_key_string() + eq(string(), '<mymod-test>') + + @mock.patch.object(gkd, 'get_modifiers') + def test_final_key_selected(self, mock_modifiers): + dialog = self.dialog + key = dialog.list_keys_final + string = dialog.key_string.get + eq = self.assertEqual + + mock_modifiers.return_value = ['Shift'] + key.get.result = '{' + dialog.final_key_selected() + eq(string(), '<Shift-Key-braceleft>') + + +class CancelTest(unittest.TestCase): + "Simulate user clicking [Cancel] button." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = gkd(cls.root, 'Title', '<<Test>>', [], _utest=True) + + @classmethod + def tearDownClass(cls): + cls.dialog.cancel() + cls.root.update_idletasks() + cls.root.destroy() + del cls.dialog, cls.root + + def test_cancel(self): + self.assertEqual(self.dialog.winfo_class(), 'Toplevel') + self.dialog.button_cancel.invoke() + with self.assertRaises(TclError): + self.dialog.winfo_class() + self.assertEqual(self.dialog.result, '') + + if __name__ == '__main__': unittest.main(verbosity=2) diff --git a/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst b/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst index 54347c58f93d..6cc3557b5190 100644 --- a/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst +++ b/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst @@ -1 +1 @@ -Apply PEP8 naming convention to config_key.py. +Update config_key: use PEP 8 names and add tests.

1 0

bpo-33234: Simplify list_preallocate_exact() (GH-11220)
by Pablo Galindo Dec. 29, 2018

Dec. 29, 2018

https://github.com/python/cpython/commit/0e5f771f38138714415f665651de7e674f… commit: 0e5f771f38138714415f665651de7e674fcebc38 branch: master author: Sergey Fedoseev <fedoseev.sergey(a)gmail.com> committer: Pablo Galindo <Pablogsal(a)gmail.com> date: 2018-12-29T22:31:36Z summary: bpo-33234: Simplify list_preallocate_exact() (GH-11220) files: M Objects/listobject.c diff --git a/Objects/listobject.c b/Objects/listobject.c index b1f2b59db0a7..17c37ba97560 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -81,26 +81,15 @@ static int list_preallocate_exact(PyListObject *self, Py_ssize_t size) { assert(self->ob_item == NULL); + assert(size > 0); - PyObject **items; - size_t allocated; - - allocated = (size_t)size; - if (allocated > (size_t)PY_SSIZE_T_MAX / sizeof(PyObject *)) { - PyErr_NoMemory(); - return -1; - } - - if (size == 0) { - allocated = 0; - } - items = (PyObject **)PyMem_New(PyObject*, allocated); + PyObject **items = PyMem_New(PyObject*, size); if (items == NULL) { PyErr_NoMemory(); return -1; } self->ob_item = items; - self->allocated = allocated; + self->allocated = size; return 0; }

1 0

bpo-35602: Make sure the transport is always closed in SelectorEventLoopUnixSockSendfileTests (GH-11338)
by Miss Islington (bot) Dec. 29, 2018

Dec. 29, 2018

https://github.com/python/cpython/commit/fe06646d186780881fa5ee61442886a6d7… commit: fe06646d186780881fa5ee61442886a6d7cf9f08 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-12-29T11:38:24-08:00 summary: bpo-35602: Make sure the transport is always closed in SelectorEventLoopUnixSockSendfileTests (GH-11338) There is a race condition in SelectorEventLoopUnixSockSendfileTests that causes the prepare() method return a non connected server protocol, making the cleanup() method skips the correct handling of the transport. This commit makes prepare() always return a connected server protocol that can always be cleaned up correctly. (cherry picked from commit d51324a2f5d172665f8824b25456c9822797fc84) Co-authored-by: Pablo Galindo <Pablogsal(a)gmail.com> files: M Lib/test/test_asyncio/test_unix_events.py diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py index 104f99593797..5d16b95456f0 100644 --- a/Lib/test/test_asyncio/test_unix_events.py +++ b/Lib/test/test_asyncio/test_unix_events.py @@ -433,10 +433,12 @@ def __init__(self, loop): self.data = bytearray() self.fut = loop.create_future() self.transport = None + self._ready = loop.create_future() def connection_made(self, transport): self.started = True self.transport = transport + self._ready.set_result(None) def data_received(self, data): self.data.extend(data) @@ -487,13 +489,11 @@ def prepare(self): server = self.run_loop(self.loop.create_server( lambda: proto, sock=srv_sock)) self.run_loop(self.loop.sock_connect(sock, (support.HOST, port))) + self.run_loop(proto._ready) def cleanup(): - if proto.transport is not None: - # can be None if the task was cancelled before - # connection_made callback - proto.transport.close() - self.run_loop(proto.wait_closed()) + proto.transport.close() + self.run_loop(proto.wait_closed()) server.close() self.run_loop(server.wait_closed())

1 0

bpo-35602: Make sure the transport is always closed in SelectorEventLoopUnixSockSendfileTests (GH-11338)
by Pablo Galindo Dec. 29, 2018

Dec. 29, 2018

https://github.com/python/cpython/commit/d51324a2f5d172665f8824b25456c98227… commit: d51324a2f5d172665f8824b25456c9822797fc84 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-12-29T19:18:38Z summary: bpo-35602: Make sure the transport is always closed in SelectorEventLoopUnixSockSendfileTests (GH-11338) There is a race condition in SelectorEventLoopUnixSockSendfileTests that causes the prepare() method return a non connected server protocol, making the cleanup() method skips the correct handling of the transport. This commit makes prepare() always return a connected server protocol that can always be cleaned up correctly. files: M Lib/test/test_asyncio/test_unix_events.py diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py index 62545c0f98c3..31e710037f76 100644 --- a/Lib/test/test_asyncio/test_unix_events.py +++ b/Lib/test/test_asyncio/test_unix_events.py @@ -449,10 +449,12 @@ def __init__(self, loop): self.data = bytearray() self.fut = loop.create_future() self.transport = None + self._ready = loop.create_future() def connection_made(self, transport): self.started = True self.transport = transport + self._ready.set_result(None) def data_received(self, data): self.data.extend(data) @@ -503,13 +505,11 @@ def prepare(self): server = self.run_loop(self.loop.create_server( lambda: proto, sock=srv_sock)) self.run_loop(self.loop.sock_connect(sock, (support.HOST, port))) + self.run_loop(proto._ready) def cleanup(): - if proto.transport is not None: - # can be None if the task was cancelled before - # connection_made callback - proto.transport.close() - self.run_loop(proto.wait_closed()) + proto.transport.close() + self.run_loop(proto.wait_closed()) server.close() self.run_loop(server.wait_closed())

1 0

Daily reference leaks (4243df51fe43): sum=12
by solipsis＠pitrou.net Dec. 29, 2018

Dec. 29, 2018

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

1 0

bpo-35603: Escape table header of make_table output that can cause potential XSS. (GH-11341)
by Serhiy Storchaka Dec. 29, 2018

Dec. 29, 2018

https://github.com/python/cpython/commit/78de01198b047347abc5e458851bb12c48… commit: 78de01198b047347abc5e458851bb12c48429e24 branch: master author: Xtreak <tir.karthi(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-12-29T10:53:14+02:00 summary: bpo-35603: Escape table header of make_table output that can cause potential XSS. (GH-11341) files: A Misc/NEWS.d/next/Library/2018-12-28-14-53-22.bpo-35603.rVCZAE.rst M Lib/difflib.py M Lib/test/test_difflib.py diff --git a/Lib/difflib.py b/Lib/difflib.py index 887c3c26cae4..4571817b9823 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -2036,6 +2036,10 @@ def make_table(self,fromlines,tolines,fromdesc='',todesc='',context=False, s.append( fmt % (next_id[i],next_href[i],fromlist[i], next_href[i],tolist[i])) if fromdesc or todesc: + fromdesc = fromdesc.replace("&", "&").replace(">", ">") \ + .replace("<", "<") + todesc = todesc.replace("&", "&").replace(">", ">") \ + .replace("<", "<") header_row = '<thead><tr>%s%s%s%s</tr></thead>' % ( '<th class="diff_next"><br /></th>', '<th colspan="2" class="diff_header">%s</th>' % fromdesc, diff --git a/Lib/test/test_difflib.py b/Lib/test/test_difflib.py index 745ccbd6659e..63ebdb0dc83b 100644 --- a/Lib/test/test_difflib.py +++ b/Lib/test/test_difflib.py @@ -238,6 +238,15 @@ def test_html_diff(self): with open(findfile('test_difflib_expect.html')) as fp: self.assertEqual(actual, fp.read()) + def test_make_table_escape_table_header(self): + html_diff = difflib.HtmlDiff() + output = html_diff.make_table(patch914575_from1.splitlines(), + patch914575_to1.splitlines(), + fromdesc='<from>', + todesc='<to>') + self.assertIn('<from>', output) + self.assertIn('<to>', output) + def test_recursion_limit(self): # Check if the problem described in patch #1413711 exists. limit = sys.getrecursionlimit() diff --git a/Misc/NEWS.d/next/Library/2018-12-28-14-53-22.bpo-35603.rVCZAE.rst b/Misc/NEWS.d/next/Library/2018-12-28-14-53-22.bpo-35603.rVCZAE.rst new file mode 100644 index 000000000000..03150c3aa494 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-12-28-14-53-22.bpo-35603.rVCZAE.rst @@ -0,0 +1,2 @@ +Escape table header output of :meth:`difflib.HtmlDiff.make_table`. +Patch by Karthikeyan Singaravelan.

1 0

Make sure file object is close if socket.create_connection fails (GH-11334)
by Miss Islington (bot) Dec. 29, 2018

Dec. 29, 2018

https://github.com/python/cpython/commit/0f756f7f564836d4f64e8f144e51f7f553… commit: 0f756f7f564836d4f64e8f144e51f7f55346b919 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-12-28T18:12:39-08:00 summary: Make sure file object is close if socket.create_connection fails (GH-11334) The problem affects _testWithTimeoutTriggeredSend in test_socket.py. (cherry picked from commit 1f511e1af060e98fb789319a96076c06e7f98135) Co-authored-by: Pablo Galindo <Pablogsal(a)gmail.com> files: M Lib/test/test_socket.py diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 9b9d11368cb7..82b89fcbafa6 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -5717,11 +5717,10 @@ def testWithTimeout(self): def _testWithTimeoutTriggeredSend(self): address = self.serv.getsockname() - file = open(support.TESTFN, 'rb') - with socket.create_connection(address, timeout=0.01) as sock, \ - file as file: - meth = self.meth_from_sock(sock) - self.assertRaises(socket.timeout, meth, file) + with open(support.TESTFN, 'rb') as file: + with socket.create_connection(address, timeout=0.01) as sock: + meth = self.meth_from_sock(sock) + self.assertRaises(socket.timeout, meth, file) def testWithTimeoutTriggeredSend(self): conn = self.accept_conn()

1 0

bpo-35601: Alleviate race condition when waiting for SIGALRM in test_asyncio (GH-11337)
by Miss Islington (bot) Dec. 29, 2018

Dec. 29, 2018

https://github.com/python/cpython/commit/8f9228dd3a37c98876c9c8ff7fb0042650… commit: 8f9228dd3a37c98876c9c8ff7fb0042650303474 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-12-28T18:01:00-08:00 summary: bpo-35601: Alleviate race condition when waiting for SIGALRM in test_asyncio (GH-11337) There is a race condition regarding signal delivery in test_signal_handling_args for test_asyncio.test_events.KqueueEventLoopTests. The signal can be received at any moment outside the time window provided in the test. The fix is to wait for the signal to be received instead with a bigger timeout. (cherry picked from commit 5471420faa84519530f29b08f2b042b2288e3e96) Co-authored-by: Pablo Galindo <Pablogsal(a)gmail.com> files: M Lib/test/test_asyncio/test_events.py diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py index 66b060349007..9466111b8ef7 100644 --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -574,6 +574,7 @@ def my_handler(): self.loop.add_signal_handler(signal.SIGALRM, my_handler) signal.setitimer(signal.ITIMER_REAL, 0.01, 0) # Send SIGALRM once. + self.loop.call_later(60, self.loop.stop) self.loop.run_forever() self.assertEqual(caught, 1) @@ -586,11 +587,12 @@ def my_handler(*args): nonlocal caught caught += 1 self.assertEqual(args, some_args) + self.loop.stop() self.loop.add_signal_handler(signal.SIGALRM, my_handler, *some_args) signal.setitimer(signal.ITIMER_REAL, 0.1, 0) # Send SIGALRM once. - self.loop.call_later(0.5, self.loop.stop) + self.loop.call_later(60, self.loop.stop) self.loop.run_forever() self.assertEqual(caught, 1)

1 0

Make sure file object is close if socket.create_connection fails (GH-11334)
by Pablo Galindo Dec. 29, 2018

Dec. 29, 2018

https://github.com/python/cpython/commit/1f511e1af060e98fb789319a96076c06e7… commit: 1f511e1af060e98fb789319a96076c06e7f98135 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-12-29T01:42:16Z summary: Make sure file object is close if socket.create_connection fails (GH-11334) The problem affects _testWithTimeoutTriggeredSend in test_socket.py. files: M Lib/test/test_socket.py diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 36d3d5ed12b3..7c5167d85033 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -5787,11 +5787,10 @@ def testWithTimeout(self): def _testWithTimeoutTriggeredSend(self): address = self.serv.getsockname() - file = open(support.TESTFN, 'rb') - with socket.create_connection(address, timeout=0.01) as sock, \ - file as file: - meth = self.meth_from_sock(sock) - self.assertRaises(socket.timeout, meth, file) + with open(support.TESTFN, 'rb') as file: + with socket.create_connection(address, timeout=0.01) as sock: + meth = self.meth_from_sock(sock) + self.assertRaises(socket.timeout, meth, file) def testWithTimeoutTriggeredSend(self): conn = self.accept_conn()

1 0