Mailman 3 July 2017 - Python-checkins

[3.6] bpo-31027: Fix test_listcomps failure when run directly (GH-2939) (#2945)
by Terry Jan Reedy July 29, 2017

July 29, 2017

https://github.com/python/cpython/commit/b26cc82b2252dd54e73661a026b32e7808… commit: b26cc82b2252dd54e73661a026b32e7808fef945 branch: 3.6 author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-07-29T14:38:24-04:00 summary: [3.6] bpo-31027: Fix test_listcomps failure when run directly (GH-2939) (#2945) Bug appears to be incomplete copy-paste-edit. (cherry picked from commit ceb93f4) files: M Lib/test/test_listcomps.py diff --git a/Lib/… [View More]

1 0

bpo-31027: Fix test_listcomps failure when run directly (#2939)
by Terry Jan Reedy July 29, 2017

July 29, 2017

https://github.com/python/cpython/commit/ceb93f4540981e3f9af66bd936920186ab… commit: ceb93f4540981e3f9af66bd936920186aba813fc branch: master author: Zackery Spytz <Osmunda46(a)gmail.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2017-07-29T12:05:55-04:00 summary: bpo-31027: Fix test_listcomps failure when run directly (#2939) Bug appears to be incomplete copy-paste-edit. files: M Lib/test/test_listcomps.py diff --git a/Lib/test/test_listcomps.py b/Lib/test/… [View More]

1 0

Daily reference leaks (4243df51fe43): sum=5
by solipsis＠pitrou.net July 29, 2017

July 29, 2017

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

1 0

[3.6] bpo-30781: IDLE - Use ttk Notebook in ConfigDialog (GH-2938) (#2944)
by Terry Jan Reedy July 29, 2017

July 29, 2017

https://github.com/python/cpython/commit/8364feff6730f54063116b607605167d90… commit: 8364feff6730f54063116b607605167d9027ce85 branch: 3.6 author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-07-29T01:28:05-04:00 summary: [3.6] bpo-30781: IDLE - Use ttk Notebook in ConfigDialog (GH-2938) (#2944) The notebook looks a bit better. It will work better with separate page classes. Traversal of widgets by Tab works better. Switching tabs with … [View More]keys becomes possible. The font sample box works better at large font sizes. One of the two simulated click tests no longer works. This will be investigated while fixing a bug with the widget itself. (cherry picked from commit b331f80) files: A Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.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 87e0d685b77..67165298a99 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -15,7 +15,7 @@ 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 Scrollbar +from tkinter.ttk import Notebook, Scrollbar import tkinter.colorchooser as tkColorChooser import tkinter.font as tkFont import tkinter.messagebox as tkMessageBox @@ -101,15 +101,19 @@ def create_widgets(self): load_configs: Load pages except for extensions. activate_config_changes: Tell editors to reload. """ - self.tab_pages = TabbedPageSet(self, - page_names=['Fonts/Tabs', 'Highlighting', 'Keys', 'General', - 'Extensions']) - self.tab_pages.pack(side=TOP, expand=TRUE, fill=BOTH) - self.create_page_font_tab() - self.create_page_highlight() - self.create_page_keys() - self.create_page_general() - self.create_page_extensions() + self.note = note = Notebook(self, width=450, height=450) + fontpage = self.create_page_font_tab() + highpage = self.create_page_highlight() + keyspage = self.create_page_keys() + genpage = self.create_page_general() + extpage = self.create_page_extensions() + note.add(fontpage, text='Fonts/Tabs') + note.add(highpage, text='Highlights') + note.add(keyspage, text=' Keys ') + note.add(genpage, text=' General ') + note.add(extpage, text='Extensions') + note.enable_traversal() + note.pack(side=TOP, expand=TRUE, fill=BOTH) self.create_action_buttons().pack(side=BOTTOM) def load_configs(self): @@ -270,7 +274,7 @@ def create_page_font_tab(self): # Create widgets: # body and body section frames. - frame = self.tab_pages.pages['Fonts/Tabs'].frame + frame = Frame(self.note) frame_font = LabelFrame( frame, borderwidth=2, relief=GROOVE, text=' Base Editor Font ') frame_indent = LabelFrame( @@ -281,7 +285,7 @@ def create_page_font_tab(self): font_name_title = Label( frame_font_name, justify=LEFT, text='Font Face :') self.fontlist = Listbox(frame_font_name, height=5, - takefocus=FALSE, exportselection=FALSE) + takefocus=True, exportselection=FALSE) self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select) self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select) self.fontlist.bind('<KeyRelease-Down>', self.on_fontlist_select) @@ -297,7 +301,7 @@ def create_page_font_tab(self): temp_font = tkFont.Font(parent, ('courier', 10, 'normal')) self.font_sample = Label( frame_font_sample, justify=LEFT, font=temp_font, - text='AaBbCcDdEe\nFfGgHhIiJjK\n1234567890\n#:+=(){}[]') + text='AaBbCcDdEe\nFfGgHhIiJj\n1234567890\n#:+=(){}[]') # frame_indent. indent_title = Label( frame_indent, justify=LEFT, @@ -493,10 +497,9 @@ def create_page_highlight(self): self.highlight_target = tracers.add( StringVar(parent), self.var_changed_highlight_target) - ##widget creation - #body frame - frame = self.tab_pages.pages['Highlighting'].frame - #body section frames + # Widget creation: + # body frame and section frames + frame = Frame(self.note) frame_custom = LabelFrame(frame, borderwidth=2, relief=GROOVE, text=' Custom Highlighting ') frame_theme = LabelFrame(frame, borderwidth=2, relief=GROOVE, @@ -504,12 +507,12 @@ def create_page_highlight(self): #frame_custom self.highlight_sample=Text( frame_custom, relief=SOLID, borderwidth=1, - font=('courier', 12, ''), cursor='hand2', width=21, height=11, + font=('courier', 12, ''), cursor='hand2', width=21, height=13, takefocus=FALSE, highlightthickness=0, wrap=NONE) text=self.highlight_sample text.bind('<Double-Button-1>', lambda e: 'break') text.bind('<B1-Motion>', lambda e: 'break') - text_and_tags=( + text_and_tags=(('\n', 'normal'), ('#you can click here', 'comment'), ('\n', 'normal'), ('#to choose items', 'comment'), ('\n', 'normal'), ('def', 'keyword'), (' ', 'normal'), @@ -525,7 +528,7 @@ def create_page_highlight(self): ('cursor |', 'cursor'), ('\n ', 'normal'), ('shell', 'console'), (' ', 'normal'), ('stdout', 'stdout'), (' ', 'normal'), - ('stderr', 'stderr'), ('\n', 'normal')) + ('stderr', 'stderr'), ('\n\n', 'normal')) for texttag in text_and_tags: text.insert(END, texttag[0], texttag[1]) for element in self.theme_elements: @@ -1039,10 +1042,9 @@ def create_page_keys(self): self.keybinding = tracers.add( StringVar(parent), self.var_changed_keybinding) - ##widget creation - #body frame - frame = self.tab_pages.pages['Keys'].frame - #body section frames + # Widget creation: + # body and section frames. + frame = Frame(self.note) frame_custom = LabelFrame( frame, borderwidth=2, relief=GROOVE, text=' Custom Key Bindings ') @@ -1449,9 +1451,8 @@ def create_page_general(self): StringVar(parent), ('main', 'EditorWindow', 'height')) # Create widgets: - # body. - frame = self.tab_pages.pages['General'].frame - # body section frames. + # body and section frames. + frame = Frame(self.note) frame_run = LabelFrame(frame, borderwidth=2, relief=GROOVE, text=' Startup Preferences ') frame_save = LabelFrame(frame, borderwidth=2, relief=GROOVE, @@ -1488,7 +1489,7 @@ def create_page_general(self): frame_helplist = Frame(frame_help) frame_helplist_buttons = Frame(frame_helplist) self.helplist = Listbox( - frame_helplist, height=5, takefocus=FALSE, + frame_helplist, height=5, takefocus=True, exportselection=FALSE) scroll_helplist = Scrollbar(frame_helplist) scroll_helplist['command'] = self.helplist.yview @@ -1669,7 +1670,7 @@ def create_page_extensions(self): save_all_changed_extensions: Call extension page Save(). """ parent = self.parent - frame = self.tab_pages.pages['Extensions'].frame + frame = Frame(self.note) self.ext_defaultCfg = idleConf.defaultCfg['extensions'] self.ext_userCfg = idleConf.userCfg['extensions'] self.is_int = self.register(is_int) @@ -1704,6 +1705,8 @@ def create_page_extensions(self): self.extension_list.selection_set(0) self.extension_selected(None) + return frame + def load_extensions(self): "Fill self.extensions with data from the default and user configs." self.extensions = {} diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py index cf6c3b31ed5..aff3c2fdc3b 100644 --- a/Lib/idlelib/idle_test/test_configdialog.py +++ b/Lib/idlelib/idle_test/test_configdialog.py @@ -296,20 +296,24 @@ def test_source_selected(self): d.set = d.set_add_delete_state d.upc = d.update_help_changes helplist = d.helplist - helplist.insert(0, 'source') - helplist.activate(0) + dex = 'end' + helplist.insert(dex, 'source') + helplist.activate(dex) helplist.focus_force() - helplist.see(0) + helplist.see(dex) helplist.update() - x, y, dx, dy = helplist.bbox(0) + x, y, dx, dy = helplist.bbox(dex) x += dx // 2 y += dy // 2 d.set.called = d.upc.called = 0 + helplist.event_generate('<Enter>', x=0, y=0) + helplist.event_generate('<Motion>', x=x, y=y) helplist.event_generate('<Button-1>', x=x, y=y) helplist.event_generate('<ButtonRelease-1>', x=x, y=y) - self.assertEqual(helplist.get('anchor'), 'source') - self.assertTrue(d.set.called) + # The following fail after the switch to + # self.assertEqual(helplist.get('anchor'), 'source') + # self.assertTrue(d.set.called) self.assertFalse(d.upc.called) def test_set_add_delete_state(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 new file mode 100644 index 00000000000..18f40a41f29 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst @@ -0,0 +1 @@ +IDLE - Use ttk Notebook in ConfigDialog [View Less]

1 0

bpo-30781: IDLE - Use ttk Notebook in ConfigDialog (#2938)
by Terry Jan Reedy July 29, 2017

July 29, 2017

https://github.com/python/cpython/commit/b331f80b4765c3201674a7ca8b35c9d4a6… commit: b331f80b4765c3201674a7ca8b35c9d4a65efe79 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-07-29T00:49:39-04:00 summary: bpo-30781: IDLE - Use ttk Notebook in ConfigDialog (#2938) The notebook looks a bit better. It will work better with separate page classes. Traversal of widgets by Tab works better. Switching tabs with keys becomes … [View More]possible. The font sample box works better at large font sizes. One of the two simulated click tests no longer works. This will be investigated while fixing a bug with the widget itself. files: A Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.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 87e0d685b77..67165298a99 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -15,7 +15,7 @@ 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 Scrollbar +from tkinter.ttk import Notebook, Scrollbar import tkinter.colorchooser as tkColorChooser import tkinter.font as tkFont import tkinter.messagebox as tkMessageBox @@ -101,15 +101,19 @@ def create_widgets(self): load_configs: Load pages except for extensions. activate_config_changes: Tell editors to reload. """ - self.tab_pages = TabbedPageSet(self, - page_names=['Fonts/Tabs', 'Highlighting', 'Keys', 'General', - 'Extensions']) - self.tab_pages.pack(side=TOP, expand=TRUE, fill=BOTH) - self.create_page_font_tab() - self.create_page_highlight() - self.create_page_keys() - self.create_page_general() - self.create_page_extensions() + self.note = note = Notebook(self, width=450, height=450) + fontpage = self.create_page_font_tab() + highpage = self.create_page_highlight() + keyspage = self.create_page_keys() + genpage = self.create_page_general() + extpage = self.create_page_extensions() + note.add(fontpage, text='Fonts/Tabs') + note.add(highpage, text='Highlights') + note.add(keyspage, text=' Keys ') + note.add(genpage, text=' General ') + note.add(extpage, text='Extensions') + note.enable_traversal() + note.pack(side=TOP, expand=TRUE, fill=BOTH) self.create_action_buttons().pack(side=BOTTOM) def load_configs(self): @@ -270,7 +274,7 @@ def create_page_font_tab(self): # Create widgets: # body and body section frames. - frame = self.tab_pages.pages['Fonts/Tabs'].frame + frame = Frame(self.note) frame_font = LabelFrame( frame, borderwidth=2, relief=GROOVE, text=' Base Editor Font ') frame_indent = LabelFrame( @@ -281,7 +285,7 @@ def create_page_font_tab(self): font_name_title = Label( frame_font_name, justify=LEFT, text='Font Face :') self.fontlist = Listbox(frame_font_name, height=5, - takefocus=FALSE, exportselection=FALSE) + takefocus=True, exportselection=FALSE) self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select) self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select) self.fontlist.bind('<KeyRelease-Down>', self.on_fontlist_select) @@ -297,7 +301,7 @@ def create_page_font_tab(self): temp_font = tkFont.Font(parent, ('courier', 10, 'normal')) self.font_sample = Label( frame_font_sample, justify=LEFT, font=temp_font, - text='AaBbCcDdEe\nFfGgHhIiJjK\n1234567890\n#:+=(){}[]') + text='AaBbCcDdEe\nFfGgHhIiJj\n1234567890\n#:+=(){}[]') # frame_indent. indent_title = Label( frame_indent, justify=LEFT, @@ -493,10 +497,9 @@ def create_page_highlight(self): self.highlight_target = tracers.add( StringVar(parent), self.var_changed_highlight_target) - ##widget creation - #body frame - frame = self.tab_pages.pages['Highlighting'].frame - #body section frames + # Widget creation: + # body frame and section frames + frame = Frame(self.note) frame_custom = LabelFrame(frame, borderwidth=2, relief=GROOVE, text=' Custom Highlighting ') frame_theme = LabelFrame(frame, borderwidth=2, relief=GROOVE, @@ -504,12 +507,12 @@ def create_page_highlight(self): #frame_custom self.highlight_sample=Text( frame_custom, relief=SOLID, borderwidth=1, - font=('courier', 12, ''), cursor='hand2', width=21, height=11, + font=('courier', 12, ''), cursor='hand2', width=21, height=13, takefocus=FALSE, highlightthickness=0, wrap=NONE) text=self.highlight_sample text.bind('<Double-Button-1>', lambda e: 'break') text.bind('<B1-Motion>', lambda e: 'break') - text_and_tags=( + text_and_tags=(('\n', 'normal'), ('#you can click here', 'comment'), ('\n', 'normal'), ('#to choose items', 'comment'), ('\n', 'normal'), ('def', 'keyword'), (' ', 'normal'), @@ -525,7 +528,7 @@ def create_page_highlight(self): ('cursor |', 'cursor'), ('\n ', 'normal'), ('shell', 'console'), (' ', 'normal'), ('stdout', 'stdout'), (' ', 'normal'), - ('stderr', 'stderr'), ('\n', 'normal')) + ('stderr', 'stderr'), ('\n\n', 'normal')) for texttag in text_and_tags: text.insert(END, texttag[0], texttag[1]) for element in self.theme_elements: @@ -1039,10 +1042,9 @@ def create_page_keys(self): self.keybinding = tracers.add( StringVar(parent), self.var_changed_keybinding) - ##widget creation - #body frame - frame = self.tab_pages.pages['Keys'].frame - #body section frames + # Widget creation: + # body and section frames. + frame = Frame(self.note) frame_custom = LabelFrame( frame, borderwidth=2, relief=GROOVE, text=' Custom Key Bindings ') @@ -1449,9 +1451,8 @@ def create_page_general(self): StringVar(parent), ('main', 'EditorWindow', 'height')) # Create widgets: - # body. - frame = self.tab_pages.pages['General'].frame - # body section frames. + # body and section frames. + frame = Frame(self.note) frame_run = LabelFrame(frame, borderwidth=2, relief=GROOVE, text=' Startup Preferences ') frame_save = LabelFrame(frame, borderwidth=2, relief=GROOVE, @@ -1488,7 +1489,7 @@ def create_page_general(self): frame_helplist = Frame(frame_help) frame_helplist_buttons = Frame(frame_helplist) self.helplist = Listbox( - frame_helplist, height=5, takefocus=FALSE, + frame_helplist, height=5, takefocus=True, exportselection=FALSE) scroll_helplist = Scrollbar(frame_helplist) scroll_helplist['command'] = self.helplist.yview @@ -1669,7 +1670,7 @@ def create_page_extensions(self): save_all_changed_extensions: Call extension page Save(). """ parent = self.parent - frame = self.tab_pages.pages['Extensions'].frame + frame = Frame(self.note) self.ext_defaultCfg = idleConf.defaultCfg['extensions'] self.ext_userCfg = idleConf.userCfg['extensions'] self.is_int = self.register(is_int) @@ -1704,6 +1705,8 @@ def create_page_extensions(self): self.extension_list.selection_set(0) self.extension_selected(None) + return frame + def load_extensions(self): "Fill self.extensions with data from the default and user configs." self.extensions = {} diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py index cf6c3b31ed5..aff3c2fdc3b 100644 --- a/Lib/idlelib/idle_test/test_configdialog.py +++ b/Lib/idlelib/idle_test/test_configdialog.py @@ -296,20 +296,24 @@ def test_source_selected(self): d.set = d.set_add_delete_state d.upc = d.update_help_changes helplist = d.helplist - helplist.insert(0, 'source') - helplist.activate(0) + dex = 'end' + helplist.insert(dex, 'source') + helplist.activate(dex) helplist.focus_force() - helplist.see(0) + helplist.see(dex) helplist.update() - x, y, dx, dy = helplist.bbox(0) + x, y, dx, dy = helplist.bbox(dex) x += dx // 2 y += dy // 2 d.set.called = d.upc.called = 0 + helplist.event_generate('<Enter>', x=0, y=0) + helplist.event_generate('<Motion>', x=x, y=y) helplist.event_generate('<Button-1>', x=x, y=y) helplist.event_generate('<ButtonRelease-1>', x=x, y=y) - self.assertEqual(helplist.get('anchor'), 'source') - self.assertTrue(d.set.called) + # The following fail after the switch to + # self.assertEqual(helplist.get('anchor'), 'source') + # self.assertTrue(d.set.called) self.assertFalse(d.upc.called) def test_set_add_delete_state(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 new file mode 100644 index 00000000000..18f40a41f29 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst @@ -0,0 +1 @@ +IDLE - Use ttk Notebook in ConfigDialog [View Less]

1 0

Fix trivial typo in multiprocessing documentation (GH-2930) (GH-2941)
by Mariatta July 29, 2017

July 29, 2017

https://github.com/python/cpython/commit/52c41f18086f3d8b1eb3854b568f04717c… commit: 52c41f18086f3d8b1eb3854b568f04717c724e3d branch: 3.5 author: Mariatta <Mariatta(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-07-28T19:56:13-07:00 summary: Fix trivial typo in multiprocessing documentation (GH-2930) (GH-2941) (cherry picked from commit 6fcb69dad579cc9a7dc15eabead43b6c37464f8c) files: M Doc/library/multiprocessing.rst diff --git a/Doc/library/… [View More]

1 0

Fix trivial typo in multiprocessing documentation (GH-2930) (GH-2940)
by Mariatta July 29, 2017

July 29, 2017

https://github.com/python/cpython/commit/e05119ad4e8285dfc48050a15ebe0cbaa0… commit: e05119ad4e8285dfc48050a15ebe0cbaa066e310 branch: 3.6 author: Mariatta <Mariatta(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-07-28T19:55:23-07:00 summary: Fix trivial typo in multiprocessing documentation (GH-2930) (GH-2940) (cherry picked from commit 6fcb69dad579cc9a7dc15eabead43b6c37464f8c) files: M Doc/library/multiprocessing.rst diff --git a/Doc/library/… [View More]

1 0

Fix trivial typo in multiprocessing documentation (GH-2930) (GH-2942)
by Mariatta July 29, 2017

July 29, 2017

https://github.com/python/cpython/commit/fa90179e071668c431e725a29f8c88d8d2… commit: fa90179e071668c431e725a29f8c88d8d25ec887 branch: 2.7 author: Mariatta <Mariatta(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-07-28T19:55:04-07:00 summary: Fix trivial typo in multiprocessing documentation (GH-2930) (GH-2942) (cherry picked from commit 6fcb69dad579cc9a7dc15eabead43b6c37464f8c) files: M Doc/library/multiprocessing.rst diff --git a/Doc/library/… [View More]

1 0

[3.6] bpo-30853: IDLE - touch-up configdialog.VarTrace and tests. (GH-2936) (#2937)
by Terry Jan Reedy July 28, 2017

July 28, 2017

https://github.com/python/cpython/commit/ecc80b3f1b56f1e4df9e592f8527e622a6… commit: ecc80b3f1b56f1e4df9e592f8527e622a6b45e01 branch: 3.6 author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-07-28T18:36:30-04:00 summary: [3.6] bpo-30853: IDLE - touch-up configdialog.VarTrace and tests. (GH-2936) (#2937) Add clear method for tests. Adjust tests to use global instance. Remove unneeded ConfigDialog method. (cherry picked from commit … [View More]5d0f30a) files: 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 92155e3726c..87e0d685b77 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -99,7 +99,6 @@ def create_widgets(self): create_page_extensions create_action_buttons load_configs: Load pages except for extensions. - remove_var_callbacks activate_config_changes: Tell editors to reload. """ self.tab_pages = TabbedPageSet(self, @@ -133,10 +132,6 @@ def load_configs(self): self.load_general_cfg() # note: extension page handled separately - def remove_var_callbacks(self): - "Remove callbacks to prevent memory leaks." - tracers.detach() - def create_action_buttons(self): """Return frame of action buttons for dialog. @@ -1846,6 +1841,11 @@ def __init__(self): self.untraced = [] self.traced = [] + def clear(self): + "Clear lists (for tests)." + self.untraced.clear() + self.traced.clear() + def add(self, var, callback): """Add (var, callback) tuple to untraced list. diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py index 7296075fbec..cf6c3b31ed5 100644 --- a/Lib/idlelib/idle_test/test_configdialog.py +++ b/Lib/idlelib/idle_test/test_configdialog.py @@ -11,7 +11,7 @@ from idlelib.idle_test.mock_idle import Func from tkinter import Tk, IntVar, BooleanVar, DISABLED, NORMAL from idlelib import config -from idlelib.configdialog import ConfigDialog, idleConf, changes, VarTrace +from idlelib.configdialog import idleConf, changes, tracers # Tests should not depend on fortuitous user configurations. # They must not affect actual user .cfg files. @@ -35,12 +35,12 @@ def setUpModule(): idleConf.userCfg = testcfg root = Tk() # root.withdraw() # Comment out, see issue 30870 - dialog = ConfigDialog(root, 'Test', _utest=True) + dialog = configdialog.ConfigDialog(root, 'Test', _utest=True) def tearDownModule(): global root, dialog idleConf.userCfg = usercfg - dialog.remove_var_callbacks() + tracers.detach() del dialog root.update_idletasks() root.destroy() @@ -423,14 +423,14 @@ def test_update_help_changes(self): d.update_help_changes = Func() -class TestVarTrace(unittest.TestCase): +class VarTraceTest(unittest.TestCase): def setUp(self): changes.clear() + tracers.clear() self.v1 = IntVar(root) self.v2 = BooleanVar(root) self.called = 0 - self.tracers = VarTrace() def tearDown(self): del self.v1, self.v2 @@ -442,11 +442,19 @@ def var_changed_boolean(self, *params): pass def test_init(self): - self.assertEqual(self.tracers.untraced, []) - self.assertEqual(self.tracers.traced, []) + tracers.__init__() + self.assertEqual(tracers.untraced, []) + self.assertEqual(tracers.traced, []) + + def test_clear(self): + tracers.untraced.append(0) + tracers.traced.append(1) + tracers.clear() + self.assertEqual(tracers.untraced, []) + self.assertEqual(tracers.traced, []) def test_add(self): - tr = self.tracers + tr = tracers func = Func() cb = tr.make_callback = mock.Mock(return_value=func) @@ -469,8 +477,7 @@ def test_add(self): del tr.make_callback def test_make_callback(self): - tr = self.tracers - cb = tr.make_callback(self.v1, ('main', 'section', 'option')) + cb = tracers.make_callback(self.v1, ('main', 'section', 'option')) self.assertTrue(callable(cb)) self.v1.set(42) # Not attached, so set didn't invoke the callback. @@ -481,7 +488,7 @@ def test_make_callback(self): self.assertEqual(changes['main']['section']['option'], '42') def test_attach_detach(self): - tr = self.tracers + tr = tracers v1 = tr.add(self.v1, self.var_changed_increment) v2 = tr.add(self.v2, self.var_changed_boolean) expected = [(v1, self.var_changed_increment), [View Less]

1 0

[65 flat] Results for Python (master branch) 2017-07-28
by lp_benchmark_robot＠intel.com July 28, 2017

July 28, 2017

Results for project python/master, build date: 2017-07-28 10:39:44-07:00. - commit: 6fcb69d - previous commit: d5ed47d - revision date: 2017-07-28 10:39:35-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+… [View More]00:00. +-----+------------------------+--------+------------+------------+------------+ | | |relative|change since|change since|current rev | | | benchmark|std_dev*| last run | baseline |run with PGO| +-----+------------------------+--------+------------+------------+------------+ | :-| | 2to3| 1.069% | +0.033% | +5.038% | +6.735% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 1.381% | +1.012% | +24.610% | +6.239% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 2.374% | -0.886% | +24.788% | +7.248% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 1.344% | +0.075% | +22.499% | +6.056% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 3.446% | -0.202% | +6.324% | +12.541% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 1.466% | +0.128% | +11.032% | +10.375% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 1.056% | -0.413% | +8.229% | +8.217% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 1.256% | -0.327% | +5.245% | +4.171% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 4.356% | +0.833% | +7.024% | +18.620% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 4.479% | +0.622% | +9.105% | +13.381% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.209% | -0.397% | +3.722% | +7.250% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.690% | -0.311% | +5.000% | +5.430% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 0.581% | -0.083% | +3.783% | +5.925% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.617% | -0.242% | +9.265% | +10.332% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 2.471% | -0.521% | +7.118% | +9.439% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.843% | -0.089% | +7.487% | +9.460% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.783% | -0.137% | +10.452% | +9.356% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 3.405% | -0.663% | +9.009% | +7.782% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 1.904% | -0.170% | +2.871% | +10.111% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 3.264% | -0.589% | +1.909% | +11.877% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.276% | -0.900% | +7.406% | +10.998% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.198% | +0.535% | +9.642% | +14.705% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.456% | -0.684% | +8.095% | +11.838% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 1.252% | -0.127% | +18.384% | +12.361% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 5.794% | +1.888% | +5.620% | +14.146% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 1.959% | +0.101% | +4.382% | +5.269% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 1.192% | -0.121% | -3.160% | +3.639% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 0.578% | +0.165% | +2.606% | +6.236% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.272% | +0.729% | +2.030% | +13.054% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 0.918% | +1.042% | +4.334% | +18.903% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.587% | +0.092% | +2.454% | +15.490% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 4.689% | -1.182% | +4.832% | +16.518% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 3.171% | -0.061% | +12.907% | +8.525% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.207% | +0.003% | +0.369% | +9.992% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.121% | -0.109% | +9.789% | +4.112% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.089% | -0.125% | +1.487% | +4.253% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.006% | +0.176% | +11.021% | +11.129% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 5.028% | -0.269% | -9.635% | +11.978% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 1.931% | -0.455% | +1.774% | +8.464% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 2.406% | +0.516% | -1.883% | +5.315% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 1.519% | -0.097% | +11.678% | +2.413% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.717% | -0.370% | +9.537% | +11.934% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 0.413% | +0.318% | +1.264% | +2.173% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 1.826% | +0.552% | +27.246% | +8.748% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 1.652% | +0.170% | +5.803% | +4.495% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 0.853% | -0.110% | +16.118% | +4.695% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 1.813% | -0.102% | +1.245% | -0.895% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.556% | +0.275% | +6.610% | -3.732% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.175% | -0.231% | +5.204% | +7.324% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.254% | -1.182% | +3.986% | +4.411% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 4.247% | -1.553% | +0.912% | +10.126% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.233% | -0.141% | +12.878% | +7.098% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.538% | -0.354% | +10.428% | +6.090% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 4.436% | -1.418% | +11.484% | +9.321% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 4.584% | -0.901% | +12.773% | +10.101% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 3.742% | +0.159% | +22.650% | +10.035% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.252% | -0.517% | +6.774% | +2.982% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 0.984% | -0.066% | +2.131% | +0.004% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 7.074% | +1.407% | +7.987% | +21.590% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 0.968% | -0.773% | -1.716% | +18.520% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 1.335% | +0.622% | +7.075% | +6.962% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 1.020% | -0.281% | +5.539% | +8.143% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.309% | -0.127% | +1.571% | +7.333% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 2.695% | -0.552% | -6.474% | +12.091% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.232% | +0.108% | +6.805% | +7.717% | +-----+------------------------+--------+------------+------------+------------+ * 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. [View Less]

1 0