Mailman 3 August 2017 - Python-checkins

bpo-30781: IDLE - use ttk widgets in configdialog (#2654)
by Terry Jan Reedy Aug. 26, 2017

Aug. 26, 2017

https://github.com/python/cpython/commit/7028e5986fceeeb73dffb5d5bf8f03d88f… commit: 7028e5986fceeeb73dffb5d5bf8f03d88f73b63d branch: master author: Cheryl Sabella <cheryl.sabella(a)gmail.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2017-08-26T14:26:02-04:00 summary: bpo-30781: IDLE - use ttk widgets in configdialog (#2654) Patch by Cheryl Sabella. 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

[3.6] bpo-31271: Fix an assertion failure in io.TextIOWrapper.write. (GH-3201) (#3209)
by Serhiy Storchaka Aug. 26, 2017

Aug. 26, 2017

https://github.com/python/cpython/commit/9bcbc6cba385a83cac8f1ff430cad76171… commit: 9bcbc6cba385a83cac8f1ff430cad7617184d2bc branch: 3.6 author: Oren Milman <orenmn(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-08-26T20:29:40+03:00 summary: [3.6] bpo-31271: Fix an assertion failure in io.TextIOWrapper.write. (GH-3201) (#3209) (cherry picked from commit a5b4ea15b61e3f3985f4f0748a18f8b888a63532) files: A Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst M Lib/test/test_io.py M Modules/_io/textio.c diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 6a2c7a9fca4..7057c927c3f 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3163,6 +3163,14 @@ def test_read_nonbytes(self): t = self.TextIOWrapper(self.StringIO('a')) self.assertRaises(TypeError, t.read) + def test_illegal_encoder(self): + # Issue 31271: Calling write() while the return value of encoder's + # encode() is invalid shouldn't cause an assertion failure. + rot13 = codecs.lookup("rot13") + with support.swap_attr(rot13, '_is_text_encoding', True): + t = io.TextIOWrapper(io.BytesIO(b'foo'), encoding="rot13") + self.assertRaises(TypeError, t.write, 'bar') + def test_illegal_decoder(self): # Issue #17106 # Bypass the early encoding check added in issue 20404 diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst new file mode 100644 index 00000000000..7bb78801057 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst @@ -0,0 +1,2 @@ +Fix an assertion failure in the write() method of `io.TextIOWrapper`, when +the encoder doesn't return a bytes object. Patch by Oren Milman. diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 61adcf60508..801bb1745bb 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -1331,6 +1331,13 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text) Py_DECREF(text); if (b == NULL) return NULL; + if (!PyBytes_Check(b)) { + PyErr_Format(PyExc_TypeError, + "encoder should return a bytes object, not '%.200s'", + Py_TYPE(b)->tp_name); + Py_DECREF(b); + return NULL; + } if (self->pending_bytes == NULL) { self->pending_bytes = PyList_New(0);

1 0

bpo-31072: Rename the new filter argument for zipapp.create_archive. (#3049)
by Paul Moore Aug. 26, 2017

Aug. 26, 2017

https://github.com/python/cpython/commit/0780bf7578dc4c9c3852dc5e869aba515a… commit: 0780bf7578dc4c9c3852dc5e869aba515a2c65b1 branch: master author: Paul Moore <p.f.moore(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-08-26T18:04:12+01:00 summary: bpo-31072: Rename the new filter argument for zipapp.create_archive. (#3049) bpo-31072: Rename the new filter argument for zipapp.create_archive (GH-3049) * Rename the new argument to "filter" * Improve tests for the new functionality * Add a "What's New" entry. files: M Doc/library/zipapp.rst M Doc/whatsnew/3.7.rst M Lib/test/test_zipapp.py M Lib/zipapp.py diff --git a/Doc/library/zipapp.rst b/Doc/library/zipapp.rst index 993c2ccc398..120bbbb6620 100644 --- a/Doc/library/zipapp.rst +++ b/Doc/library/zipapp.rst @@ -99,7 +99,7 @@ The module defines two convenience functions: .. function:: create_archive(source, target=None, interpreter=None, main=None, - include_file=None) + filter=None) Create an application archive from *source*. The source can be any of the following: @@ -144,9 +144,10 @@ The module defines two convenience functions: contain a ``__main__.py`` file, as otherwise the resulting archive would not be executable. - The *include_file* argument specifies a callback function that is passed the - relative path to the file in order to determine which files to store when - being called against a directory. + The optional *filter* argument specifies a callback function that + is passed a Path object representing the path to the file being added + (relative to the source directory). It should return ``True`` if the + file is to be added. If a file object is specified for *source* or *target*, it is the caller's responsibility to close it after calling create_archive. @@ -157,6 +158,9 @@ The module defines two convenience functions: passed to the ``zipfile.ZipFile`` class, and must supply the methods needed by that class. + .. versionadded:: 3.7 + Added the *filter* argument. + .. function:: get_interpreter(archive) Return the interpreter specified in the ``#!`` line at the start of the diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst index a92ad9f1df4..8547660e188 100644 --- a/Doc/whatsnew/3.7.rst +++ b/Doc/whatsnew/3.7.rst @@ -258,6 +258,13 @@ Function :func:`~uu.encode` now accepts an optional *backtick* keyword argument. When it's true, zeros are represented by ``'`'`` instead of spaces. (Contributed by Xiang Zhang in :issue:`30103`.) +zipapp +------ + +Function :func:`zipapp.create_archive` now accepts an optional *filter* +argument, to allow the user to select which files should be included in the +archive. + Optimizations ============= diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py index 47eed5f4a6c..56cf37c9afa 100644 --- a/Lib/test/test_zipapp.py +++ b/Lib/test/test_zipapp.py @@ -53,10 +53,11 @@ def test_create_archive_with_subdirs(self): self.assertIn('foo/', z.namelist()) self.assertIn('bar/', z.namelist()) - def test_create_archive_with_include_file(self): - # Test packing a directory and using include_file to specify which files to include. - def skip_pyc_files(file): - return '.pyc' not in str(file) + def test_create_archive_with_filter(self): + # Test packing a directory and using filter to specify + # which files to include. + def skip_pyc_files(path): + return path.suffix != '.pyc' source = self.tmpdir / 'source' source.mkdir() (source / '__main__.py').touch() @@ -64,12 +65,32 @@ def skip_pyc_files(file): (source / 'test.pyc').touch() target = self.tmpdir / 'source.pyz' - zipapp.create_archive(source, target, include_file=skip_pyc_files) + zipapp.create_archive(source, target, filter=skip_pyc_files) with zipfile.ZipFile(target, 'r') as z: self.assertIn('__main__.py', z.namelist()) self.assertIn('test.py', z.namelist()) self.assertNotIn('test.pyc', z.namelist()) + def test_create_archive_filter_exclude_dir(self): + # Test packing a directory and using a filter to exclude a + # subdirectory (ensures that the path supplied to include + # is relative to the source location, as expected). + def skip_dummy_dir(path): + return path.parts[0] != 'dummy' + source = self.tmpdir / 'source' + source.mkdir() + (source / '__main__.py').touch() + (source / 'test.py').touch() + (source / 'dummy').mkdir() + (source / 'dummy' / 'test2.py').touch() + target = self.tmpdir / 'source.pyz' + + zipapp.create_archive(source, target, filter=skip_dummy_dir) + with zipfile.ZipFile(target, 'r') as z: + self.assertEqual(len(z.namelist()), 2) + self.assertIn('__main__.py', z.namelist()) + self.assertIn('test.py', z.namelist()) + def test_create_archive_default_target(self): # Test packing a directory to the default name. source = self.tmpdir / 'source' diff --git a/Lib/zipapp.py b/Lib/zipapp.py index bf15b6806dd..51d0290a901 100644 --- a/Lib/zipapp.py +++ b/Lib/zipapp.py @@ -74,7 +74,7 @@ def _copy_archive(archive, new_archive, interpreter=None): def create_archive(source, target=None, interpreter=None, main=None, - include_file=None): + filter=None): """Create an application archive from SOURCE. The SOURCE can be the name of a directory, or a filename or a file-like @@ -135,9 +135,9 @@ def create_archive(source, target=None, interpreter=None, main=None, _write_file_prefix(fd, interpreter) with zipfile.ZipFile(fd, 'w') as z: for child in source.rglob('*'): - arcname = child.relative_to(source).as_posix() - if include_file is None or include_file(pathlib.Path(arcname)): - z.write(child, arcname) + arcname = child.relative_to(source) + if filter is None or filter(arcname): + z.write(child, arcname.as_posix()) if main_py: z.writestr('__main__.py', main_py.encode('utf-8'))

1 0

[3.6] bpo-28261: Prevent raising SystemError where PyArg_ParseTuple is used to parse non-args. (#3210)
by Serhiy Storchaka Aug. 26, 2017

Aug. 26, 2017

https://github.com/python/cpython/commit/8e67981fc8e1bf3cb9774b5fbf4a39b8d6… commit: 8e67981fc8e1bf3cb9774b5fbf4a39b8d65ba4ff branch: 3.6 author: Oren Milman <orenmn(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-08-26T15:27:50+03:00 summary: [3.6] bpo-28261: Prevent raising SystemError where PyArg_ParseTuple is used to parse non-args. (#3210) files: M Lib/test/test_audioop.py M Lib/test/test_io.py M Modules/_io/textio.c M Modules/audioop.c diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py index 8f34d72427e..9baa62ad45c 100644 --- a/Lib/test/test_audioop.py +++ b/Lib/test/test_audioop.py @@ -405,6 +405,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, 3, 4: self.assertEqual(audioop.reverse(b'', w), b'') diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 8c91ad2ad8a..6a2c7a9fca4 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3410,6 +3410,7 @@ def test_newline_decoder(self): decoder = codecs.getincrementaldecoder("utf-8")() decoder = self.IncrementalNewlineDecoder(decoder, translate=True) self.check_newline_decoding_utf8(decoder) + self.assertRaises(TypeError, decoder.setstate, 42) def test_newline_bytes(self): # Issue 5433: Excessive optimization in IncrementalNewlineDecoder diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index bc8d11efa52..61adcf60508 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -538,6 +538,12 @@ _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self) _PyIO_str_getstate, NULL); if (state == NULL) return NULL; + if (!PyTuple_Check(state)) { + PyErr_SetString(PyExc_TypeError, + "illegal decoder state"); + Py_DECREF(state); + return NULL; + } if (!PyArg_ParseTuple(state, "OK", &buffer, &flag)) { Py_DECREF(state); return NULL; @@ -569,6 +575,10 @@ _io_IncrementalNewlineDecoder_setstate(nldecoder_object *self, PyObject *buffer; unsigned long long flag; + if (!PyTuple_Check(state)) { + PyErr_SetString(PyExc_TypeError, "state argument must be a tuple"); + return NULL; + } if (!PyArg_ParseTuple(state, "OK", &buffer, &flag)) return NULL; @@ -2320,6 +2330,12 @@ _io_TextIOWrapper_tell_impl(textio *self) _PyIO_str_getstate, NULL); \ if (_state == NULL) \ goto fail; \ + if (!PyTuple_Check(_state)) { \ + PyErr_SetString(PyExc_TypeError, \ + "illegal decoder state"); \ + Py_DECREF(_state); \ + goto fail; \ + } \ if (!PyArg_ParseTuple(_state, "Oi", &dec_buffer, &dec_flags)) { \ Py_DECREF(_state); \ goto fail; \ diff --git a/Modules/audioop.c b/Modules/audioop.c index dcd7788d621..d5820425191 100644 --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -1293,7 +1293,7 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width, char *cp, *ncp; Py_ssize_t len; int chan, d, *prev_i, *cur_i, cur_o; - PyObject *samps, *str, *rv = NULL; + PyObject *samps, *str, *rv = NULL, *channel; int bytes_per_frame; if (!audioop_check_size(width)) @@ -1354,6 +1354,10 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width, 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)) @@ -1364,7 +1368,13 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width, 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

Daily reference leaks (4243df51fe43): sum=-2
by solipsis＠pitrou.net Aug. 26, 2017

Aug. 26, 2017

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_forkserver leaked [1, -2, 2] memory blocks, sum=1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflog6_kuqb', '--timeout', '7200']

1 0

[65 flat] Results for Python (master branch) 2017-08-25
by lp_benchmark_robot＠intel.com Aug. 25, 2017

Aug. 25, 2017

Results for project python/master, build date: 2017-08-25 03:04:19-07:00. - commit: a3a6df3 - previous commit: a6296d3 - revision date: 2017-08-24 18:15:02-07:00 - environment: Broadwell-EP - cpu: Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz 2x22 cores, stepping 1, LLC 55 MB - mem: 128 GB - os: Ubuntu 16.04.2 LTS - kernel: 4.4.0-62-generic x86_64 GNU/Linux Baseline results were generated using release v3.6.0, with hash 5c4568a from 2016-12-22 23:38:47+00:00. +-----+------------------------+--------+------------+------------+------------+ | | |relative|change since|change since|current rev | | | benchmark|std_dev*| last run | baseline |run with PGO| +-----+------------------------+--------+------------+------------+------------+ | :-| | 2to3| 1.076% | -0.195% | +3.294% | +7.610% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 1.395% | +0.663% | +24.346% | +6.682% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 1.710% | -0.004% | +24.711% | +6.949% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 0.905% | +0.058% | +23.085% | +2.896% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 1.836% | -0.678% | +2.231% | +14.293% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 2.095% | -0.450% | +11.462% | +10.083% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 0.624% | -0.374% | +5.680% | +11.195% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.857% | -0.076% | +3.620% | +5.508% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 4.518% | -0.518% | +6.251% | +17.079% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 5.044% | -3.165% | +6.723% | +13.263% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.520% | -0.450% | +3.706% | +6.139% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.535% | +0.243% | +5.347% | +4.092% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 0.646% | +0.451% | +3.504% | +6.216% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.766% | -1.114% | +8.156% | +8.968% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 2.210% | +0.195% | +6.109% | +6.956% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.816% | -0.094% | +6.277% | +10.955% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.578% | -0.470% | +8.756% | +11.498% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 3.520% | -0.103% | +6.621% | +9.451% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 1.865% | +0.297% | +4.910% | +7.603% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 2.137% | -0.138% | +1.318% | +12.914% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.619% | -1.821% | +5.282% | +9.944% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.701% | +0.809% | +46.870% | +10.810% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.545% | -1.494% | +7.527% | +9.041% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.423% | +0.135% | +19.394% | +10.299% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 5.176% | -0.330% | +4.880% | +13.650% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 2.080% | -0.980% | +3.898% | +4.626% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.539% | +0.368% | -4.524% | +5.737% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 1.188% | -0.575% | +1.781% | +6.706% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.284% | -1.699% | +2.643% | +10.369% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 3.653% | -0.459% | -0.137% | +21.211% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.314% | +0.262% | +1.647% | +24.466% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.959% | +0.138% | +6.291% | +21.780% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 4.125% | +1.152% | +11.719% | +9.397% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.234% | +0.142% | +0.398% | +9.199% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.138% | -0.300% | +8.447% | +4.854% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.098% | -0.177% | +0.536% | +4.649% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.386% | -0.449% | +8.643% | +13.801% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 4.335% | +0.651% | -7.074% | +10.130% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 1.534% | -0.003% | +1.761% | +9.919% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 1.477% | -0.468% | +0.223% | +1.129% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 1.933% | -0.171% | +11.168% | +4.303% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 2.093% | -0.321% | +7.954% | +13.895% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 0.340% | +0.176% | +0.801% | +2.531% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 1.665% | +0.127% | +26.755% | +8.678% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 1.554% | -0.023% | +5.076% | +5.099% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 0.837% | -0.139% | +14.845% | +5.847% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 2.973% | +0.366% | +0.645% | +0.774% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.381% | +0.724% | +5.599% | +1.730% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.324% | -1.185% | +4.866% | +8.428% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.207% | -1.220% | +4.607% | +5.496% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 4.310% | -1.694% | -0.849% | +11.781% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.499% | -1.215% | +11.686% | +8.027% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.519% | -0.450% | +10.042% | +5.962% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 4.550% | -0.547% | +11.168% | +9.150% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 4.469% | -1.183% | +13.385% | +9.002% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 3.216% | -0.507% | +22.809% | +11.321% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.044% | -0.419% | +5.550% | +6.125% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 1.110% | +0.015% | +2.295% | -0.939% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 9.804% | -0.117% | +7.272% | +20.740% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 0.844% | -0.009% | -2.017% | +17.694% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 2.898% | -0.763% | +5.915% | +7.157% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 1.521% | -0.220% | +5.595% | +7.952% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.367% | +0.161% | +2.303% | +5.610% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 1.538% | -0.150% | -5.215% | +10.776% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.126% | +0.320% | +7.051% | +7.942% | +-----+------------------------+--------+------------+------------+------------+ * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/65-flat-results-for-python-master-bra… Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

bpo-31271: Fix an assertion failure in io.TextIOWrapper.write. (#3201)
by Serhiy Storchaka Aug. 25, 2017

Aug. 25, 2017

https://github.com/python/cpython/commit/a5b4ea15b61e3f3985f4f0748a18f8b888… commit: a5b4ea15b61e3f3985f4f0748a18f8b888a63532 branch: master author: Oren Milman <orenmn(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-08-25T21:14:54+03:00 summary: bpo-31271: Fix an assertion failure in io.TextIOWrapper.write. (#3201) files: A Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst M Lib/test/test_io.py M Modules/_io/textio.c diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index ab0cbe16361..ba95c1442fa 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3225,6 +3225,14 @@ def test_read_nonbytes(self): t = self.TextIOWrapper(self.StringIO('a')) self.assertRaises(TypeError, t.read) + def test_illegal_encoder(self): + # Issue 31271: Calling write() while the return value of encoder's + # encode() is invalid shouldn't cause an assertion failure. + rot13 = codecs.lookup("rot13") + with support.swap_attr(rot13, '_is_text_encoding', True): + t = io.TextIOWrapper(io.BytesIO(b'foo'), encoding="rot13") + self.assertRaises(TypeError, t.write, 'bar') + def test_illegal_decoder(self): # Issue #17106 # Bypass the early encoding check added in issue 20404 diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst new file mode 100644 index 00000000000..7bb78801057 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst @@ -0,0 +1,2 @@ +Fix an assertion failure in the write() method of `io.TextIOWrapper`, when +the encoder doesn't return a bytes object. Patch by Oren Milman. diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 5103ae659ce..402f743c61f 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -1387,6 +1387,13 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text) Py_DECREF(text); if (b == NULL) return NULL; + if (!PyBytes_Check(b)) { + PyErr_Format(PyExc_TypeError, + "encoder should return a bytes object, not '%.200s'", + Py_TYPE(b)->tp_name); + Py_DECREF(b); + return NULL; + } if (self->pending_bytes == NULL) { self->pending_bytes = PyList_New(0);

1 0

bpo-31279: Silence -Wstringop-overflow warning. (#3207)
by Stefan Krah Aug. 25, 2017

Aug. 25, 2017

https://github.com/python/cpython/commit/dce6502059f46a04f90938b9d832394c82… commit: dce6502059f46a04f90938b9d832394c8215397b branch: master author: Stefan Krah <skrah(a)bytereef.org> committer: GitHub <noreply(a)github.com> date: 2017-08-25T20:12:05+02:00 summary: bpo-31279: Silence -Wstringop-overflow warning. (#3207) files: M Objects/bytearrayobject.c diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 22dd810a7dd..857a1aa070e 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -224,7 +224,7 @@ PyByteArray_Resize(PyObject *self, Py_ssize_t requested_size) return -1; } memcpy(sval, PyByteArray_AS_STRING(self), - Py_MIN(requested_size, Py_SIZE(self))); + Py_MIN((size_t)requested_size, (size_t)Py_SIZE(self))); PyObject_Free(obj->ob_bytes); } else {

1 0

bpo-31275: Small refactoring to silence a fall-through warning. (#3206)
by Stefan Krah Aug. 25, 2017

Aug. 25, 2017

https://github.com/python/cpython/commit/138753c1b96b5e06a5c5d409fa4cae5e2f… commit: 138753c1b96b5e06a5c5d409fa4cae5e2fe1108b branch: master author: Stefan Krah <skrah(a)bytereef.org> committer: GitHub <noreply(a)github.com> date: 2017-08-25T18:31:22+02:00 summary: bpo-31275: Small refactoring to silence a fall-through warning. (#3206) files: M Modules/cjkcodecs/_codecs_iso2022.c diff --git a/Modules/cjkcodecs/_codecs_iso2022.c b/Modules/cjkcodecs/_codecs_iso2022.c index 1ce4218f308..7394cf67e0e 100644 --- a/Modules/cjkcodecs/_codecs_iso2022.c +++ b/Modules/cjkcodecs/_codecs_iso2022.c @@ -807,15 +807,9 @@ jisx0213_encoder(const Py_UCS4 *data, Py_ssize_t *length, void *config) case 2: /* second character of unicode pair */ coded = find_pairencmap((ucs2_t)data[0], (ucs2_t)data[1], jisx0213_pair_encmap, JISX0213_ENCPAIRS); - if (coded == DBCINV) { - *length = 1; - coded = find_pairencmap((ucs2_t)data[0], 0, - jisx0213_pair_encmap, JISX0213_ENCPAIRS); - if (coded == DBCINV) - return MAP_UNMAPPABLE; - } - else + if (coded != DBCINV) return coded; + /* fall through */ case -1: /* flush unterminated */ *length = 1;

1 0

bpo-30923: Silence fall-through warnings in libexpat build. (#3205)
by Stefan Krah Aug. 25, 2017

Aug. 25, 2017

https://github.com/python/cpython/commit/9e1e6f528f3fec16b9bd99f5ee38048ffe… commit: 9e1e6f528f3fec16b9bd99f5ee38048ffec04a81 branch: master author: Stefan Krah <skrah(a)bytereef.org> committer: GitHub <noreply(a)github.com> date: 2017-08-25T14:07:50+02:00 summary: bpo-30923: Silence fall-through warnings in libexpat build. (#3205) files: M setup.py diff --git a/setup.py b/setup.py index f3c2538345e..36a52bc6aac 100644 --- a/setup.py +++ b/setup.py @@ -1518,6 +1518,7 @@ class db_found(Exception): pass if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"): expat_inc = [] define_macros = [] + extra_compile_args = [] expat_lib = ['expat'] expat_sources = [] expat_depends = [] @@ -1529,6 +1530,7 @@ class db_found(Exception): pass # call XML_SetHashSalt(), expat entropy sources are not needed ('XML_POOR_ENTROPY', '1'), ] + extra_compile_args = [] expat_lib = [] expat_sources = ['expat/xmlparse.c', 'expat/xmlrole.c', @@ -1546,8 +1548,15 @@ class db_found(Exception): pass 'expat/xmltok_impl.h' ] + cc = sysconfig.get_config_var('CC').split()[0] + ret = os.system( + '"%s" -Werror -Wimplicit-fallthrough -E -xc /dev/null >/dev/null 2>&1' % cc) + if ret >> 8 == 0: + extra_compile_args.append('-Wno-implicit-fallthrough') + exts.append(Extension('pyexpat', define_macros = define_macros, + extra_compile_args = extra_compile_args, include_dirs = expat_inc, libraries = expat_lib, sources = ['pyexpat.c'] + expat_sources,

1 0