Mailman 3 June 2014 - Python-checkins

cpython: #20295: Teach imghdr to recognize OpenEXR format images.
by r.david.murray 26 Jun '14

26 Jun '14

http://hg.python.org/cpython/rev/71b9a841119a changeset: 91426:71b9a841119a parent: 91424:9f51e71bf761 user: R David Murray <rdmurray(a)bitdance.com> date: Thu Jun 26 12:27:57 2014 -0400 summary: #20295: Teach imghdr to recognize OpenEXR format images. Patch by Martin Vignali, test by Claudiu Popa. files: Doc/library/imghdr.rst | 5 +++++ Doc/whatsnew/3.5.rst | 6 ++++++ Lib/imghdr.py | 6 ++++++ Lib/test/imghdrdata/python.exr | Bin Lib/test/test_imghdr.py | 1 + Misc/NEWS | 2 ++ 6 files changed, 20 insertions(+), 0 deletions(-) diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst --- a/Doc/library/imghdr.rst +++ b/Doc/library/imghdr.rst @@ -50,6 +50,11 @@ +------------+-----------------------------------+ | ``'webp'`` | WebP files | +------------+-----------------------------------+ +| ``'exr'`` | OpenEXR Files | ++------------+-----------------------------------+ + +.. versionadded:: 3.5 + The *exr* format was added. .. versionchanged:: 3.5 The *webp* type was added. diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -141,6 +141,12 @@ *module* contains no docstrings instead of raising :exc:`ValueError` (contributed by Glenn Jones in :issue:`15916`). +imghdr +------ + +* :func:`~imghdr.what` now recognizes the `OpenEXR <http://www.openexr.com>`_ + format (contributed by Martin vignali and Cladui Popa in :issue:`20295`). + importlib --------- diff --git a/Lib/imghdr.py b/Lib/imghdr.py --- a/Lib/imghdr.py +++ b/Lib/imghdr.py @@ -116,6 +116,12 @@ tests.append(test_webp) +def test_exr(h, f): + if h.startswith(b'\x76\x2f\x31\x01'): + return 'exr' + +tests.append(test_exr) + #--------------------# # Small test program # #--------------------# diff --git a/Lib/test/imghdrdata/python.exr b/Lib/test/imghdrdata/python.exr new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..773c81ee1fb850cdbb6cccd3ae5edabb80146481 GIT binary patch [stripped] diff --git a/Lib/test/test_imghdr.py b/Lib/test/test_imghdr.py --- a/Lib/test/test_imghdr.py +++ b/Lib/test/test_imghdr.py @@ -18,6 +18,7 @@ ('python.tiff', 'tiff'), ('python.xbm', 'xbm'), ('python.webp', 'webp'), + ('python.exr', 'exr'), ) class UnseekableIO(io.FileIO): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -103,6 +103,8 @@ Library ------- +- Issue #20295: imghdr now recognizes OpenEXR format images. + - Issue #21729: Used the "with" statement in the dbm.dumb module to ensure files closing. Patch by Claudiu Popa. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19145: Remove duplicate ACKS entry
by raymond.hettinger 26 Jun '14

26 Jun '14

http://hg.python.org/cpython/rev/07eb04003839 changeset: 91425:07eb04003839 branch: 2.7 parent: 91420:752439a6bdd9 user: Raymond Hettinger <python(a)rcn.com> date: Thu Jun 26 09:27:36 2014 -0700 summary: Issue #19145: Remove duplicate ACKS entry files: Misc/ACKS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1384,7 +1384,6 @@ Pauli Virtanen Frank Visser Johannes Vogel -Vajrasky Kok Alex Volkov Guido Vranken Martijn Vries -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge
by raymond.hettinger 26 Jun '14

26 Jun '14

http://hg.python.org/cpython/rev/9f51e71bf761 changeset: 91424:9f51e71bf761 parent: 91422:3151f6f9df85 parent: 91423:463f499ef591 user: Raymond Hettinger <python(a)rcn.com> date: Thu Jun 26 09:25:41 2014 -0700 summary: merge files: Misc/ACKS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1399,7 +1399,6 @@ Pauli Virtanen Frank Visser Johannes Vogel -Vajrasky Kok Alex Volkov Martijn Vries Sjoerd de Vries -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue #19145: Remove duplicate ACKS entry
by raymond.hettinger 26 Jun '14

26 Jun '14

http://hg.python.org/cpython/rev/463f499ef591 changeset: 91423:463f499ef591 branch: 3.4 parent: 91421:ed60a73e1c82 user: Raymond Hettinger <python(a)rcn.com> date: Thu Jun 26 09:25:18 2014 -0700 summary: Issue #19145: Remove duplicate ACKS entry files: Misc/ACKS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1388,7 +1388,6 @@ Pauli Virtanen Frank Visser Johannes Vogel -Vajrasky Kok Alex Volkov Martijn Vries Sjoerd de Vries -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (cb04c94014ea): sum=11
by solipsis＠pitrou.net 26 Jun '14

26 Jun '14

results for cb04c94014ea on branch "default" -------------------------------------------- test_collections leaked [0, -2, 0] references, sum=-2 test_functools leaked [0, 0, 3] memory blocks, sum=3 test_io leaked [2, 2, 2] references, sum=6 test_site leaked [2, 0, 0] references, sum=2 test_site leaked [2, 0, 0] memory blocks, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogC_GJT1', '-x']

1 0

cpython (merge 3.4 -> default): Merge with 3.4
by terry.reedy 26 Jun '14

26 Jun '14

http://hg.python.org/cpython/rev/3151f6f9df85 changeset: 91422:3151f6f9df85 parent: 91419:cb04c94014ea parent: 91421:ed60a73e1c82 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Jun 26 01:41:06 2014 -0400 summary: Merge with 3.4 files: Lib/idlelib/SearchDialogBase.py | 87 +++++++++++++------- 1 files changed, 57 insertions(+), 30 deletions(-) diff --git a/Lib/idlelib/SearchDialogBase.py b/Lib/idlelib/SearchDialogBase.py --- a/Lib/idlelib/SearchDialogBase.py +++ b/Lib/idlelib/SearchDialogBase.py @@ -1,16 +1,19 @@ '''Define SearchDialogBase used by Search, Replace, and Grep dialogs.''' -from tkinter import * + +from tkinter import (Toplevel, Frame, Entry, Label, Button, + Checkbutton, Radiobutton) class SearchDialogBase: - '''Create most of a modal search dialog (make_frame, create_widgets). + '''Create most of a 3 or 4 row, 3 column search dialog. - The wide left column contains: - 1 or 2 text entry lines (create_entries, make_entry); - a row of standard radiobuttons (create_option_buttons); - a row of dialog specific radiobuttons (create_other_buttons). + The left and wide middle column contain: + 1 or 2 labeled text entry lines (make_entry, create_entries); + a row of standard Checkbuttons (make_frame, create_option_buttons), + each of which corresponds to a search engine Variable; + a row of dialog-specific Check/Radiobuttons (create_other_buttons). The narrow right column contains command buttons - (create_command_buttons, make_button). + (make_button, create_command_buttons). These are bound to functions that execute the command. Except for command buttons, this base class is not limited to @@ -19,16 +22,27 @@ The other dialogs override methods to replace and add widgets. ''' - title = "Search Dialog" + title = "Search Dialog" # replace in subclasses icon = "Search" - needwrapbutton = 1 + needwrapbutton = 1 # not in Find in Files def __init__(self, root, engine): + '''Initialize root, engine, and top attributes. + + top (level widget): set in create_widgets() called from open(). + text (Text being searched): set in open(), only used in subclasses(). + ent (ry): created in make_entry() called from create_entry(). + row (of grid): 0 in create_widgets(), +1 in make_entry/frame(). + + title (of dialog): class attribute, override in subclasses. + icon (of dialog): ditto, use unclear if cannot minimize dialog. + ''' self.root = root self.engine = engine self.top = None def open(self, text, searchphrase=None): + "Make dialog visible on top of others and ready to use." self.text = text if not self.top: self.create_widgets() @@ -44,11 +58,17 @@ self.top.grab_set() def close(self, event=None): + "Put dialog away for later use." if self.top: self.top.grab_release() self.top.withdraw() def create_widgets(self): + '''Create basic 3 row x 3 col search (find) dialog. + + Other dialogs override subsidiary create_x methods as needed. + Replace and Find-in-Files add another entry row. + ''' top = Toplevel(self.root) top.bind("<Return>", self.default_command) top.bind("<Escape>", self.close) @@ -61,12 +81,13 @@ self.top.grid_columnconfigure(0, pad=2, weight=0) self.top.grid_columnconfigure(1, pad=2, minsize=100, weight=100) - self.create_entries() - self.create_option_buttons() - self.create_other_buttons() - return self.create_command_buttons() + self.create_entries() # row 0 (and maybe 1), cols 0, 1 + self.create_option_buttons() # next row, cols 0, 1 + self.create_other_buttons() # next row, cols 0, 1 + self.create_command_buttons() # col 2, all rows def make_entry(self, label, var): + "Return gridded labeled Entry." l = Label(self.top, text=label) l.grid(row=self.row, column=0, sticky="nw") e = Entry(self.top, textvariable=var, exportselection=0) @@ -74,7 +95,12 @@ self.row = self.row + 1 return e + def create_entries(self): + "Create one or more entry lines with make_entry." + self.ent = self.make_entry("Find:", self.engine.patvar) + def make_frame(self,labeltext=None): + "Return gridded labeled Frame for option or other buttons." if labeltext: l = Label(self.top, text=labeltext) l.grid(row=self.row, column=0, sticky="nw") @@ -83,19 +109,8 @@ self.row = self.row + 1 return f - def make_button(self, label, command, isdef=0): - b = Button(self.buttonframe, - text=label, command=command, - default=isdef and "active" or "normal") - cols,rows=self.buttonframe.grid_size() - b.grid(pady=1,row=rows,column=0,sticky="ew") - self.buttonframe.grid(rowspan=rows+1) - return b - - def create_entries(self): - self.ent = self.make_entry("Find:", self.engine.patvar) - def create_option_buttons(self): + "Fill frame with Checkbuttons bound to SearchEngine booleanvars." f = self.make_frame("Options") btn = Checkbutton(f, anchor="w", @@ -128,11 +143,9 @@ btn.select() def create_other_buttons(self): + "Fill frame with buttons tied to other options." f = self.make_frame("Direction") - #lbl = Label(f, text="Direction: ") - #lbl.pack(side="left") - btn = Radiobutton(f, anchor="w", variable=self.engine.backvar, value=1, text="Up") @@ -147,11 +160,25 @@ if not self.engine.isback(): btn.select() + def make_button(self, label, command, isdef=0): + "Return command button gridded in command frame." + b = Button(self.buttonframe, + text=label, command=command, + default=isdef and "active" or "normal") + cols,rows=self.buttonframe.grid_size() + b.grid(pady=1,row=rows,column=0,sticky="ew") + self.buttonframe.grid(rowspan=rows+1) + return b + def create_command_buttons(self): - # - # place button frame on the right + "Place buttons in vertical command frame gridded on right." f = self.buttonframe = Frame(self.top) f.grid(row=0,column=2,padx=2,pady=2,ipadx=2,ipady=2) b = self.make_button("close", self.close) b.lower() + +if __name__ == '__main__': + import unittest + unittest.main( + 'idlelib.idle_test.test_searchdialogbase', verbosity=2) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue #18592: For idlelib.SearchDialogBase, edit and add docstrings,
by terry.reedy 26 Jun '14

26 Jun '14

http://hg.python.org/cpython/rev/ed60a73e1c82 changeset: 91421:ed60a73e1c82 branch: 3.4 parent: 91418:8cd3e6b0f5cc user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Jun 26 01:40:51 2014 -0400 summary: Issue #18592: For idlelib.SearchDialogBase, edit and add docstrings, move two functions next to the functions that use them. files: Lib/idlelib/SearchDialogBase.py | 87 +++++++++++++------- 1 files changed, 57 insertions(+), 30 deletions(-) diff --git a/Lib/idlelib/SearchDialogBase.py b/Lib/idlelib/SearchDialogBase.py --- a/Lib/idlelib/SearchDialogBase.py +++ b/Lib/idlelib/SearchDialogBase.py @@ -1,16 +1,19 @@ '''Define SearchDialogBase used by Search, Replace, and Grep dialogs.''' -from tkinter import * + +from tkinter import (Toplevel, Frame, Entry, Label, Button, + Checkbutton, Radiobutton) class SearchDialogBase: - '''Create most of a modal search dialog (make_frame, create_widgets). + '''Create most of a 3 or 4 row, 3 column search dialog. - The wide left column contains: - 1 or 2 text entry lines (create_entries, make_entry); - a row of standard radiobuttons (create_option_buttons); - a row of dialog specific radiobuttons (create_other_buttons). + The left and wide middle column contain: + 1 or 2 labeled text entry lines (make_entry, create_entries); + a row of standard Checkbuttons (make_frame, create_option_buttons), + each of which corresponds to a search engine Variable; + a row of dialog-specific Check/Radiobuttons (create_other_buttons). The narrow right column contains command buttons - (create_command_buttons, make_button). + (make_button, create_command_buttons). These are bound to functions that execute the command. Except for command buttons, this base class is not limited to @@ -19,16 +22,27 @@ The other dialogs override methods to replace and add widgets. ''' - title = "Search Dialog" + title = "Search Dialog" # replace in subclasses icon = "Search" - needwrapbutton = 1 + needwrapbutton = 1 # not in Find in Files def __init__(self, root, engine): + '''Initialize root, engine, and top attributes. + + top (level widget): set in create_widgets() called from open(). + text (Text being searched): set in open(), only used in subclasses(). + ent (ry): created in make_entry() called from create_entry(). + row (of grid): 0 in create_widgets(), +1 in make_entry/frame(). + + title (of dialog): class attribute, override in subclasses. + icon (of dialog): ditto, use unclear if cannot minimize dialog. + ''' self.root = root self.engine = engine self.top = None def open(self, text, searchphrase=None): + "Make dialog visible on top of others and ready to use." self.text = text if not self.top: self.create_widgets() @@ -44,11 +58,17 @@ self.top.grab_set() def close(self, event=None): + "Put dialog away for later use." if self.top: self.top.grab_release() self.top.withdraw() def create_widgets(self): + '''Create basic 3 row x 3 col search (find) dialog. + + Other dialogs override subsidiary create_x methods as needed. + Replace and Find-in-Files add another entry row. + ''' top = Toplevel(self.root) top.bind("<Return>", self.default_command) top.bind("<Escape>", self.close) @@ -61,12 +81,13 @@ self.top.grid_columnconfigure(0, pad=2, weight=0) self.top.grid_columnconfigure(1, pad=2, minsize=100, weight=100) - self.create_entries() - self.create_option_buttons() - self.create_other_buttons() - return self.create_command_buttons() + self.create_entries() # row 0 (and maybe 1), cols 0, 1 + self.create_option_buttons() # next row, cols 0, 1 + self.create_other_buttons() # next row, cols 0, 1 + self.create_command_buttons() # col 2, all rows def make_entry(self, label, var): + "Return gridded labeled Entry." l = Label(self.top, text=label) l.grid(row=self.row, column=0, sticky="nw") e = Entry(self.top, textvariable=var, exportselection=0) @@ -74,7 +95,12 @@ self.row = self.row + 1 return e + def create_entries(self): + "Create one or more entry lines with make_entry." + self.ent = self.make_entry("Find:", self.engine.patvar) + def make_frame(self,labeltext=None): + "Return gridded labeled Frame for option or other buttons." if labeltext: l = Label(self.top, text=labeltext) l.grid(row=self.row, column=0, sticky="nw") @@ -83,19 +109,8 @@ self.row = self.row + 1 return f - def make_button(self, label, command, isdef=0): - b = Button(self.buttonframe, - text=label, command=command, - default=isdef and "active" or "normal") - cols,rows=self.buttonframe.grid_size() - b.grid(pady=1,row=rows,column=0,sticky="ew") - self.buttonframe.grid(rowspan=rows+1) - return b - - def create_entries(self): - self.ent = self.make_entry("Find:", self.engine.patvar) - def create_option_buttons(self): + "Fill frame with Checkbuttons bound to SearchEngine booleanvars." f = self.make_frame("Options") btn = Checkbutton(f, anchor="w", @@ -128,11 +143,9 @@ btn.select() def create_other_buttons(self): + "Fill frame with buttons tied to other options." f = self.make_frame("Direction") - #lbl = Label(f, text="Direction: ") - #lbl.pack(side="left") - btn = Radiobutton(f, anchor="w", variable=self.engine.backvar, value=1, text="Up") @@ -147,11 +160,25 @@ if not self.engine.isback(): btn.select() + def make_button(self, label, command, isdef=0): + "Return command button gridded in command frame." + b = Button(self.buttonframe, + text=label, command=command, + default=isdef and "active" or "normal") + cols,rows=self.buttonframe.grid_size() + b.grid(pady=1,row=rows,column=0,sticky="ew") + self.buttonframe.grid(rowspan=rows+1) + return b + def create_command_buttons(self): - # - # place button frame on the right + "Place buttons in vertical command frame gridded on right." f = self.buttonframe = Frame(self.top) f.grid(row=0,column=2,padx=2,pady=2,ipadx=2,ipady=2) b = self.make_button("close", self.close) b.lower() + +if __name__ == '__main__': + import unittest + unittest.main( + 'idlelib.idle_test.test_searchdialogbase', verbosity=2) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #18592: For idlelib.SearchDialogBase, edit and add docstrings,
by terry.reedy 26 Jun '14

26 Jun '14

http://hg.python.org/cpython/rev/752439a6bdd9 changeset: 91420:752439a6bdd9 branch: 2.7 parent: 91407:2672e30d9095 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Jun 26 01:40:46 2014 -0400 summary: Issue #18592: For idlelib.SearchDialogBase, edit and add docstrings, move two functions next to the functions that use them. files: Lib/idlelib/SearchDialogBase.py | 87 +++++++++++++------- 1 files changed, 57 insertions(+), 30 deletions(-) diff --git a/Lib/idlelib/SearchDialogBase.py b/Lib/idlelib/SearchDialogBase.py --- a/Lib/idlelib/SearchDialogBase.py +++ b/Lib/idlelib/SearchDialogBase.py @@ -1,16 +1,19 @@ '''Define SearchDialogBase used by Search, Replace, and Grep dialogs.''' -from Tkinter import * + +from Tkinter import (Toplevel, Frame, Entry, Label, Button, + Checkbutton, Radiobutton) class SearchDialogBase: - '''Create most of a modal search dialog (make_frame, create_widgets). + '''Create most of a 3 or 4 row, 3 column search dialog. - The wide left column contains: - 1 or 2 text entry lines (create_entries, make_entry); - a row of standard radiobuttons (create_option_buttons); - a row of dialog specific radiobuttons (create_other_buttons). + The left and wide middle column contain: + 1 or 2 labeled text entry lines (make_entry, create_entries); + a row of standard Checkbuttons (make_frame, create_option_buttons), + each of which corresponds to a search engine Variable; + a row of dialog-specific Check/Radiobuttons (create_other_buttons). The narrow right column contains command buttons - (create_command_buttons, make_button). + (make_button, create_command_buttons). These are bound to functions that execute the command. Except for command buttons, this base class is not limited to @@ -19,16 +22,27 @@ The other dialogs override methods to replace and add widgets. ''' - title = "Search Dialog" + title = "Search Dialog" # replace in subclasses icon = "Search" - needwrapbutton = 1 + needwrapbutton = 1 # not in Find in Files def __init__(self, root, engine): + '''Initialize root, engine, and top attributes. + + top (level widget): set in create_widgets() called from open(). + text (Text being searched): set in open(), only used in subclasses(). + ent (ry): created in make_entry() called from create_entry(). + row (of grid): 0 in create_widgets(), +1 in make_entry/frame(). + + title (of dialog): class attribute, override in subclasses. + icon (of dialog): ditto, use unclear if cannot minimize dialog. + ''' self.root = root self.engine = engine self.top = None def open(self, text, searchphrase=None): + "Make dialog visible on top of others and ready to use." self.text = text if not self.top: self.create_widgets() @@ -44,11 +58,17 @@ self.top.grab_set() def close(self, event=None): + "Put dialog away for later use." if self.top: self.top.grab_release() self.top.withdraw() def create_widgets(self): + '''Create basic 3 row x 3 col search (find) dialog. + + Other dialogs override subsidiary create_x methods as needed. + Replace and Find-in-Files add another entry row. + ''' top = Toplevel(self.root) top.bind("<Return>", self.default_command) top.bind("<Escape>", self.close) @@ -61,12 +81,13 @@ self.top.grid_columnconfigure(0, pad=2, weight=0) self.top.grid_columnconfigure(1, pad=2, minsize=100, weight=100) - self.create_entries() - self.create_option_buttons() - self.create_other_buttons() - return self.create_command_buttons() + self.create_entries() # row 0 (and maybe 1), cols 0, 1 + self.create_option_buttons() # next row, cols 0, 1 + self.create_other_buttons() # next row, cols 0, 1 + self.create_command_buttons() # col 2, all rows def make_entry(self, label, var): + "Return gridded labeled Entry." l = Label(self.top, text=label) l.grid(row=self.row, column=0, sticky="nw") e = Entry(self.top, textvariable=var, exportselection=0) @@ -74,7 +95,12 @@ self.row = self.row + 1 return e + def create_entries(self): + "Create one or more entry lines with make_entry." + self.ent = self.make_entry("Find:", self.engine.patvar) + def make_frame(self,labeltext=None): + "Return gridded labeled Frame for option or other buttons." if labeltext: l = Label(self.top, text=labeltext) l.grid(row=self.row, column=0, sticky="nw") @@ -83,19 +109,8 @@ self.row = self.row + 1 return f - def make_button(self, label, command, isdef=0): - b = Button(self.buttonframe, - text=label, command=command, - default=isdef and "active" or "normal") - cols,rows=self.buttonframe.grid_size() - b.grid(pady=1,row=rows,column=0,sticky="ew") - self.buttonframe.grid(rowspan=rows+1) - return b - - def create_entries(self): - self.ent = self.make_entry("Find:", self.engine.patvar) - def create_option_buttons(self): + "Fill frame with Checkbuttons bound to SearchEngine booleanvars." f = self.make_frame("Options") btn = Checkbutton(f, anchor="w", @@ -128,11 +143,9 @@ btn.select() def create_other_buttons(self): + "Fill frame with buttons tied to other options." f = self.make_frame("Direction") - #lbl = Label(f, text="Direction: ") - #lbl.pack(side="left") - btn = Radiobutton(f, anchor="w", variable=self.engine.backvar, value=1, text="Up") @@ -147,11 +160,25 @@ if not self.engine.isback(): btn.select() + def make_button(self, label, command, isdef=0): + "Return command button gridded in command frame." + b = Button(self.buttonframe, + text=label, command=command, + default=isdef and "active" or "normal") + cols,rows=self.buttonframe.grid_size() + b.grid(pady=1,row=rows,column=0,sticky="ew") + self.buttonframe.grid(rowspan=rows+1) + return b + def create_command_buttons(self): - # - # place button frame on the right + "Place buttons in vertical command frame gridded on right." f = self.buttonframe = Frame(self.top) f.grid(row=0,column=2,padx=2,pady=2,ipadx=2,ipady=2) b = self.make_button("close", self.close) b.lower() + +if __name__ == '__main__': + import unittest + unittest.main( + 'idlelib.idle_test.test_searchdialogbase', verbosity=2) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): (Merge 3.4) asyncio: Handle error handler: enhance formatting of the callback
by victor.stinner 25 Jun '14

25 Jun '14

http://hg.python.org/cpython/rev/cb04c94014ea changeset: 91419:cb04c94014ea parent: 91417:24282c6f6019 parent: 91418:8cd3e6b0f5cc user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Jun 26 01:36:47 2014 +0200 summary: (Merge 3.4) asyncio: Handle error handler: enhance formatting of the callback files: Lib/asyncio/events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py --- a/Lib/asyncio/events.py +++ b/Lib/asyncio/events.py @@ -89,8 +89,8 @@ try: self._callback(*self._args) except Exception as exc: - msg = 'Exception in callback {}{!r}'.format(self._callback, - self._args) + cb = _format_callback(self._callback, self._args) + msg = 'Exception in callback {}'.format(cb) self._loop.call_exception_handler({ 'message': msg, 'exception': exc, -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): asyncio: Handle error handler: enhance formatting of the callback
by victor.stinner 25 Jun '14

25 Jun '14

http://hg.python.org/cpython/rev/8cd3e6b0f5cc changeset: 91418:8cd3e6b0f5cc branch: 3.4 parent: 91416:4e4c6e2ed0c5 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Jun 26 01:35:45 2014 +0200 summary: asyncio: Handle error handler: enhance formatting of the callback files: Lib/asyncio/events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py --- a/Lib/asyncio/events.py +++ b/Lib/asyncio/events.py @@ -89,8 +89,8 @@ try: self._callback(*self._args) except Exception as exc: - msg = 'Exception in callback {}{!r}'.format(self._callback, - self._args) + cb = _format_callback(self._callback, self._args) + msg = 'Exception in callback {}'.format(cb) self._loop.call_exception_handler({ 'message': msg, 'exception': exc, -- Repository URL: http://hg.python.org/cpython

1 0