Mailman 3 November 2017 - Python-checkins

bpo-32139: test_strftime does not anymore modify the locale (GH-4569)
by xdegaye Nov. 29, 2017

Nov. 29, 2017

https://github.com/python/cpython/commit/cc55e78acab93a495c974b9a2ea71c8bb9… commit: cc55e78acab93a495c974b9a2ea71c8bb9cc2f5d branch: master author: xdegaye <xdegaye(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-11-29T11:36:48+01:00 summary: bpo-32139: test_strftime does not anymore modify the locale (GH-4569) files: M Lib/test/test_strftime.py diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py index 72b1910c383..ec305e54ff2 100644 --- a/Lib/test/test_strftime.py +++ b/Lib/test/test_strftime.py @@ -58,8 +58,10 @@ def setUp(self): import java java.util.Locale.setDefault(java.util.Locale.US) except ImportError: - import locale - locale.setlocale(locale.LC_TIME, 'C') + from locale import setlocale, LC_TIME + saved_locale = setlocale(LC_TIME) + setlocale(LC_TIME, 'C') + self.addCleanup(setlocale, LC_TIME, saved_locale) def test_strftime(self): now = time.time()

1 0

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

Nov. 29, 2017

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

1 0

bpo-32164: Delete unused file idlelib/tabbedpages.py (GH-4628) (#4631)
by Terry Jan Reedy Nov. 28, 2017

Nov. 28, 2017

https://github.com/python/cpython/commit/957aef7c41ccae8a60d3dbbe8863401bd2… commit: 957aef7c41ccae8a60d3dbbe8863401bd270dc86 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2017-11-29T01:07:21-05:00 summary: bpo-32164: Delete unused file idlelib/tabbedpages.py (GH-4628) (#4631) (cherry picked from commit 041efd292ebff46060fc1680b0608b1d4c876a48) files: A Misc/NEWS.d/next/IDLE/2017-11-28-21-47-15.bpo-32164.2T2Na8.rst D Lib/idlelib/tabbedpages.py diff --git a/Lib/idlelib/tabbedpages.py b/Lib/idlelib/tabbedpages.py deleted file mode 100644 index 4186fa20131..00000000000 --- a/Lib/idlelib/tabbedpages.py +++ /dev/null @@ -1,498 +0,0 @@ -"""An implementation of tabbed pages using only standard Tkinter. - -Originally developed for use in IDLE. Based on tabpage.py. - -Classes exported: -TabbedPageSet -- A Tkinter implementation of a tabbed-page widget. -TabSet -- A widget containing tabs (buttons) in one or more rows. - -""" -from tkinter import * - -class InvalidNameError(Exception): pass -class AlreadyExistsError(Exception): pass - - -class TabSet(Frame): - """A widget containing tabs (buttons) in one or more rows. - - Only one tab may be selected at a time. - - """ - def __init__(self, page_set, select_command, - tabs=None, n_rows=1, max_tabs_per_row=5, - expand_tabs=False, **kw): - """Constructor arguments: - - select_command -- A callable which will be called when a tab is - selected. It is called with the name of the selected tab as an - argument. - - tabs -- A list of strings, the names of the tabs. Should be specified in - the desired tab order. The first tab will be the default and first - active tab. If tabs is None or empty, the TabSet will be initialized - empty. - - n_rows -- Number of rows of tabs to be shown. If n_rows <= 0 or is - None, then the number of rows will be decided by TabSet. See - _arrange_tabs() for details. - - max_tabs_per_row -- Used for deciding how many rows of tabs are needed, - when the number of rows is not constant. See _arrange_tabs() for - details. - - """ - Frame.__init__(self, page_set, **kw) - self.select_command = select_command - self.n_rows = n_rows - self.max_tabs_per_row = max_tabs_per_row - self.expand_tabs = expand_tabs - self.page_set = page_set - - self._tabs = {} - self._tab2row = {} - if tabs: - self._tab_names = list(tabs) - else: - self._tab_names = [] - self._selected_tab = None - self._tab_rows = [] - - self.padding_frame = Frame(self, height=2, - borderwidth=0, relief=FLAT, - background=self.cget('background')) - self.padding_frame.pack(side=TOP, fill=X, expand=False) - - self._arrange_tabs() - - def add_tab(self, tab_name): - """Add a new tab with the name given in tab_name.""" - if not tab_name: - raise InvalidNameError("Invalid Tab name: '%s'" % tab_name) - if tab_name in self._tab_names: - raise AlreadyExistsError("Tab named '%s' already exists" %tab_name) - - self._tab_names.append(tab_name) - self._arrange_tabs() - - def remove_tab(self, tab_name): - """Remove the tab named <tab_name>""" - if not tab_name in self._tab_names: - raise KeyError("No such Tab: '%s" % tab_name) - - self._tab_names.remove(tab_name) - self._arrange_tabs() - - def set_selected_tab(self, tab_name): - """Show the tab named <tab_name> as the selected one""" - if tab_name == self._selected_tab: - return - if tab_name is not None and tab_name not in self._tabs: - raise KeyError("No such Tab: '%s" % tab_name) - - # deselect the current selected tab - if self._selected_tab is not None: - self._tabs[self._selected_tab].set_normal() - self._selected_tab = None - - if tab_name is not None: - # activate the tab named tab_name - self._selected_tab = tab_name - tab = self._tabs[tab_name] - tab.set_selected() - # move the tab row with the selected tab to the bottom - tab_row = self._tab2row[tab] - tab_row.pack_forget() - tab_row.pack(side=TOP, fill=X, expand=0) - - def _add_tab_row(self, tab_names, expand_tabs): - if not tab_names: - return - - tab_row = Frame(self) - tab_row.pack(side=TOP, fill=X, expand=0) - self._tab_rows.append(tab_row) - - for tab_name in tab_names: - tab = TabSet.TabButton(tab_name, self.select_command, - tab_row, self) - if expand_tabs: - tab.pack(side=LEFT, fill=X, expand=True) - else: - tab.pack(side=LEFT) - self._tabs[tab_name] = tab - self._tab2row[tab] = tab_row - - # tab is the last one created in the above loop - tab.is_last_in_row = True - - def _reset_tab_rows(self): - while self._tab_rows: - tab_row = self._tab_rows.pop() - tab_row.destroy() - self._tab2row = {} - - def _arrange_tabs(self): - """ - Arrange the tabs in rows, in the order in which they were added. - - If n_rows >= 1, this will be the number of rows used. Otherwise the - number of rows will be calculated according to the number of tabs and - max_tabs_per_row. In this case, the number of rows may change when - adding/removing tabs. - - """ - # remove all tabs and rows - while self._tabs: - self._tabs.popitem()[1].destroy() - self._reset_tab_rows() - - if not self._tab_names: - return - - if self.n_rows is not None and self.n_rows > 0: - n_rows = self.n_rows - else: - # calculate the required number of rows - n_rows = (len(self._tab_names) - 1) // self.max_tabs_per_row + 1 - - # not expanding the tabs with more than one row is very ugly - expand_tabs = self.expand_tabs or n_rows > 1 - i = 0 # index in self._tab_names - for row_index in range(n_rows): - # calculate required number of tabs in this row - n_tabs = (len(self._tab_names) - i - 1) // (n_rows - row_index) + 1 - tab_names = self._tab_names[i:i + n_tabs] - i += n_tabs - self._add_tab_row(tab_names, expand_tabs) - - # re-select selected tab so it is properly displayed - selected = self._selected_tab - self.set_selected_tab(None) - if selected in self._tab_names: - self.set_selected_tab(selected) - - class TabButton(Frame): - """A simple tab-like widget.""" - - bw = 2 # borderwidth - - def __init__(self, name, select_command, tab_row, tab_set): - """Constructor arguments: - - name -- The tab's name, which will appear in its button. - - select_command -- The command to be called upon selection of the - tab. It is called with the tab's name as an argument. - - """ - Frame.__init__(self, tab_row, borderwidth=self.bw, relief=RAISED) - - self.name = name - self.select_command = select_command - self.tab_set = tab_set - self.is_last_in_row = False - - self.button = Radiobutton( - self, text=name, command=self._select_event, - padx=5, pady=1, takefocus=FALSE, indicatoron=FALSE, - highlightthickness=0, selectcolor='', borderwidth=0) - self.button.pack(side=LEFT, fill=X, expand=True) - - self._init_masks() - self.set_normal() - - def _select_event(self, *args): - """Event handler for tab selection. - - With TabbedPageSet, this calls TabbedPageSet.change_page, so that - selecting a tab changes the page. - - Note that this does -not- call set_selected -- it will be called by - TabSet.set_selected_tab, which should be called when whatever the - tabs are related to changes. - - """ - self.select_command(self.name) - return - - def set_selected(self): - """Assume selected look""" - self._place_masks(selected=True) - - def set_normal(self): - """Assume normal look""" - self._place_masks(selected=False) - - def _init_masks(self): - page_set = self.tab_set.page_set - background = page_set.pages_frame.cget('background') - # mask replaces the middle of the border with the background color - self.mask = Frame(page_set, borderwidth=0, relief=FLAT, - background=background) - # mskl replaces the bottom-left corner of the border with a normal - # left border - self.mskl = Frame(page_set, borderwidth=0, relief=FLAT, - background=background) - self.mskl.ml = Frame(self.mskl, borderwidth=self.bw, - relief=RAISED) - self.mskl.ml.place(x=0, y=-self.bw, - width=2*self.bw, height=self.bw*4) - # mskr replaces the bottom-right corner of the border with a normal - # right border - self.mskr = Frame(page_set, borderwidth=0, relief=FLAT, - background=background) - self.mskr.mr = Frame(self.mskr, borderwidth=self.bw, - relief=RAISED) - - def _place_masks(self, selected=False): - height = self.bw - if selected: - height += self.bw - - self.mask.place(in_=self, - relx=0.0, x=0, - rely=1.0, y=0, - relwidth=1.0, width=0, - relheight=0.0, height=height) - - self.mskl.place(in_=self, - relx=0.0, x=-self.bw, - rely=1.0, y=0, - relwidth=0.0, width=self.bw, - relheight=0.0, height=height) - - page_set = self.tab_set.page_set - if selected and ((not self.is_last_in_row) or - (self.winfo_rootx() + self.winfo_width() < - page_set.winfo_rootx() + page_set.winfo_width()) - ): - # for a selected tab, if its rightmost edge isn't on the - # rightmost edge of the page set, the right mask should be one - # borderwidth shorter (vertically) - height -= self.bw - - self.mskr.place(in_=self, - relx=1.0, x=0, - rely=1.0, y=0, - relwidth=0.0, width=self.bw, - relheight=0.0, height=height) - - self.mskr.mr.place(x=-self.bw, y=-self.bw, - width=2*self.bw, height=height + self.bw*2) - - # finally, lower the tab set so that all of the frames we just - # placed hide it - self.tab_set.lower() - - -class TabbedPageSet(Frame): - """A Tkinter tabbed-pane widget. - - Constains set of 'pages' (or 'panes') with tabs above for selecting which - page is displayed. Only one page will be displayed at a time. - - Pages may be accessed through the 'pages' attribute, which is a dictionary - of pages, using the name given as the key. A page is an instance of a - subclass of Tk's Frame widget. - - The page widgets will be created (and destroyed when required) by the - TabbedPageSet. Do not call the page's pack/place/grid/destroy methods. - - Pages may be added or removed at any time using the add_page() and - remove_page() methods. - - """ - - class Page(object): - """Abstract base class for TabbedPageSet's pages. - - Subclasses must override the _show() and _hide() methods. - - """ - uses_grid = False - - def __init__(self, page_set): - self.frame = Frame(page_set, borderwidth=2, relief=RAISED) - - def _show(self): - raise NotImplementedError - - def _hide(self): - raise NotImplementedError - - class PageRemove(Page): - """Page class using the grid placement manager's "remove" mechanism.""" - uses_grid = True - - def _show(self): - self.frame.grid(row=0, column=0, sticky=NSEW) - - def _hide(self): - self.frame.grid_remove() - - class PageLift(Page): - """Page class using the grid placement manager's "lift" mechanism.""" - uses_grid = True - - def __init__(self, page_set): - super(TabbedPageSet.PageLift, self).__init__(page_set) - self.frame.grid(row=0, column=0, sticky=NSEW) - self.frame.lower() - - def _show(self): - self.frame.lift() - - def _hide(self): - self.frame.lower() - - class PagePackForget(Page): - """Page class using the pack placement manager's "forget" mechanism.""" - def _show(self): - self.frame.pack(fill=BOTH, expand=True) - - def _hide(self): - self.frame.pack_forget() - - def __init__(self, parent, page_names=None, page_class=PageLift, - n_rows=1, max_tabs_per_row=5, expand_tabs=False, - **kw): - """Constructor arguments: - - page_names -- A list of strings, each will be the dictionary key to a - page's widget, and the name displayed on the page's tab. Should be - specified in the desired page order. The first page will be the default - and first active page. If page_names is None or empty, the - TabbedPageSet will be initialized empty. - - n_rows, max_tabs_per_row -- Parameters for the TabSet which will - manage the tabs. See TabSet's docs for details. - - page_class -- Pages can be shown/hidden using three mechanisms: - - * PageLift - All pages will be rendered one on top of the other. When - a page is selected, it will be brought to the top, thus hiding all - other pages. Using this method, the TabbedPageSet will not be resized - when pages are switched. (It may still be resized when pages are - added/removed.) - - * PageRemove - When a page is selected, the currently showing page is - hidden, and the new page shown in its place. Using this method, the - TabbedPageSet may resize when pages are changed. - - * PagePackForget - This mechanism uses the pack placement manager. - When a page is shown it is packed, and when it is hidden it is - unpacked (i.e. pack_forget). This mechanism may also cause the - TabbedPageSet to resize when the page is changed. - - """ - Frame.__init__(self, parent, **kw) - - self.page_class = page_class - self.pages = {} - self._pages_order = [] - self._current_page = None - self._default_page = None - - self.columnconfigure(0, weight=1) - self.rowconfigure(1, weight=1) - - self.pages_frame = Frame(self) - self.pages_frame.grid(row=1, column=0, sticky=NSEW) - if self.page_class.uses_grid: - self.pages_frame.columnconfigure(0, weight=1) - self.pages_frame.rowconfigure(0, weight=1) - - # the order of the following commands is important - self._tab_set = TabSet(self, self.change_page, n_rows=n_rows, - max_tabs_per_row=max_tabs_per_row, - expand_tabs=expand_tabs) - if page_names: - for name in page_names: - self.add_page(name) - self._tab_set.grid(row=0, column=0, sticky=NSEW) - - self.change_page(self._default_page) - - def add_page(self, page_name): - """Add a new page with the name given in page_name.""" - if not page_name: - raise InvalidNameError("Invalid TabPage name: '%s'" % page_name) - if page_name in self.pages: - raise AlreadyExistsError( - "TabPage named '%s' already exists" % page_name) - - self.pages[page_name] = self.page_class(self.pages_frame) - self._pages_order.append(page_name) - self._tab_set.add_tab(page_name) - - if len(self.pages) == 1: # adding first page - self._default_page = page_name - self.change_page(page_name) - - def remove_page(self, page_name): - """Destroy the page whose name is given in page_name.""" - if not page_name in self.pages: - raise KeyError("No such TabPage: '%s" % page_name) - - self._pages_order.remove(page_name) - - # handle removing last remaining, default, or currently shown page - if len(self._pages_order) > 0: - if page_name == self._default_page: - # set a new default page - self._default_page = self._pages_order[0] - else: - self._default_page = None - - if page_name == self._current_page: - self.change_page(self._default_page) - - self._tab_set.remove_tab(page_name) - page = self.pages.pop(page_name) - page.frame.destroy() - - def change_page(self, page_name): - """Show the page whose name is given in page_name.""" - if self._current_page == page_name: - return - if page_name is not None and page_name not in self.pages: - raise KeyError("No such TabPage: '%s'" % page_name) - - if self._current_page is not None: - self.pages[self._current_page]._hide() - self._current_page = None - - if page_name is not None: - self._current_page = page_name - self.pages[page_name]._show() - - self._tab_set.set_selected_tab(page_name) - - -def _tabbed_pages(parent): # htest # - top=Toplevel(parent) - x, y = map(int, parent.geometry().split('+')[1:]) - top.geometry("+%d+%d" % (x, y + 175)) - top.title("Test tabbed pages") - tabPage=TabbedPageSet(top, page_names=['Foobar','Baz'], n_rows=0, - expand_tabs=False, - ) - tabPage.pack(side=TOP, expand=TRUE, fill=BOTH) - Label(tabPage.pages['Foobar'].frame, text='Foo', pady=20).pack() - Label(tabPage.pages['Foobar'].frame, text='Bar', pady=20).pack() - Label(tabPage.pages['Baz'].frame, text='Baz').pack() - entryPgName=Entry(top) - buttonAdd=Button(top, text='Add Page', - command=lambda:tabPage.add_page(entryPgName.get())) - buttonRemove=Button(top, text='Remove Page', - command=lambda:tabPage.remove_page(entryPgName.get())) - labelPgName=Label(top, text='name of page to add/remove:') - buttonAdd.pack(padx=5, pady=5) - buttonRemove.pack(padx=5, pady=5) - labelPgName.pack(padx=5) - entryPgName.pack(padx=5) - -if __name__ == '__main__': - from idlelib.idle_test.htest import run - run(_tabbed_pages) diff --git a/Misc/NEWS.d/next/IDLE/2017-11-28-21-47-15.bpo-32164.2T2Na8.rst b/Misc/NEWS.d/next/IDLE/2017-11-28-21-47-15.bpo-32164.2T2Na8.rst new file mode 100644 index 00000000000..1db575c3c6d --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2017-11-28-21-47-15.bpo-32164.2T2Na8.rst @@ -0,0 +1,2 @@ +Delete unused file idlelib/tabbedpages.py. Use of TabbedPageSet in +configdialog was replaced by ttk.Notebook.

1 0

bpo-32164: Delete unused file idlelib/tabbedpages.py (#4628)
by Terry Jan Reedy Nov. 28, 2017

Nov. 28, 2017

https://github.com/python/cpython/commit/041efd292ebff46060fc1680b0608b1d4c… commit: 041efd292ebff46060fc1680b0608b1d4c876a48 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-11-29T00:08:28-05:00 summary: bpo-32164: Delete unused file idlelib/tabbedpages.py (#4628) files: A Misc/NEWS.d/next/IDLE/2017-11-28-21-47-15.bpo-32164.2T2Na8.rst D Lib/idlelib/tabbedpages.py diff --git a/Lib/idlelib/tabbedpages.py b/Lib/idlelib/tabbedpages.py deleted file mode 100644 index 4186fa20131..00000000000 --- a/Lib/idlelib/tabbedpages.py +++ /dev/null @@ -1,498 +0,0 @@ -"""An implementation of tabbed pages using only standard Tkinter. - -Originally developed for use in IDLE. Based on tabpage.py. - -Classes exported: -TabbedPageSet -- A Tkinter implementation of a tabbed-page widget. -TabSet -- A widget containing tabs (buttons) in one or more rows. - -""" -from tkinter import * - -class InvalidNameError(Exception): pass -class AlreadyExistsError(Exception): pass - - -class TabSet(Frame): - """A widget containing tabs (buttons) in one or more rows. - - Only one tab may be selected at a time. - - """ - def __init__(self, page_set, select_command, - tabs=None, n_rows=1, max_tabs_per_row=5, - expand_tabs=False, **kw): - """Constructor arguments: - - select_command -- A callable which will be called when a tab is - selected. It is called with the name of the selected tab as an - argument. - - tabs -- A list of strings, the names of the tabs. Should be specified in - the desired tab order. The first tab will be the default and first - active tab. If tabs is None or empty, the TabSet will be initialized - empty. - - n_rows -- Number of rows of tabs to be shown. If n_rows <= 0 or is - None, then the number of rows will be decided by TabSet. See - _arrange_tabs() for details. - - max_tabs_per_row -- Used for deciding how many rows of tabs are needed, - when the number of rows is not constant. See _arrange_tabs() for - details. - - """ - Frame.__init__(self, page_set, **kw) - self.select_command = select_command - self.n_rows = n_rows - self.max_tabs_per_row = max_tabs_per_row - self.expand_tabs = expand_tabs - self.page_set = page_set - - self._tabs = {} - self._tab2row = {} - if tabs: - self._tab_names = list(tabs) - else: - self._tab_names = [] - self._selected_tab = None - self._tab_rows = [] - - self.padding_frame = Frame(self, height=2, - borderwidth=0, relief=FLAT, - background=self.cget('background')) - self.padding_frame.pack(side=TOP, fill=X, expand=False) - - self._arrange_tabs() - - def add_tab(self, tab_name): - """Add a new tab with the name given in tab_name.""" - if not tab_name: - raise InvalidNameError("Invalid Tab name: '%s'" % tab_name) - if tab_name in self._tab_names: - raise AlreadyExistsError("Tab named '%s' already exists" %tab_name) - - self._tab_names.append(tab_name) - self._arrange_tabs() - - def remove_tab(self, tab_name): - """Remove the tab named <tab_name>""" - if not tab_name in self._tab_names: - raise KeyError("No such Tab: '%s" % tab_name) - - self._tab_names.remove(tab_name) - self._arrange_tabs() - - def set_selected_tab(self, tab_name): - """Show the tab named <tab_name> as the selected one""" - if tab_name == self._selected_tab: - return - if tab_name is not None and tab_name not in self._tabs: - raise KeyError("No such Tab: '%s" % tab_name) - - # deselect the current selected tab - if self._selected_tab is not None: - self._tabs[self._selected_tab].set_normal() - self._selected_tab = None - - if tab_name is not None: - # activate the tab named tab_name - self._selected_tab = tab_name - tab = self._tabs[tab_name] - tab.set_selected() - # move the tab row with the selected tab to the bottom - tab_row = self._tab2row[tab] - tab_row.pack_forget() - tab_row.pack(side=TOP, fill=X, expand=0) - - def _add_tab_row(self, tab_names, expand_tabs): - if not tab_names: - return - - tab_row = Frame(self) - tab_row.pack(side=TOP, fill=X, expand=0) - self._tab_rows.append(tab_row) - - for tab_name in tab_names: - tab = TabSet.TabButton(tab_name, self.select_command, - tab_row, self) - if expand_tabs: - tab.pack(side=LEFT, fill=X, expand=True) - else: - tab.pack(side=LEFT) - self._tabs[tab_name] = tab - self._tab2row[tab] = tab_row - - # tab is the last one created in the above loop - tab.is_last_in_row = True - - def _reset_tab_rows(self): - while self._tab_rows: - tab_row = self._tab_rows.pop() - tab_row.destroy() - self._tab2row = {} - - def _arrange_tabs(self): - """ - Arrange the tabs in rows, in the order in which they were added. - - If n_rows >= 1, this will be the number of rows used. Otherwise the - number of rows will be calculated according to the number of tabs and - max_tabs_per_row. In this case, the number of rows may change when - adding/removing tabs. - - """ - # remove all tabs and rows - while self._tabs: - self._tabs.popitem()[1].destroy() - self._reset_tab_rows() - - if not self._tab_names: - return - - if self.n_rows is not None and self.n_rows > 0: - n_rows = self.n_rows - else: - # calculate the required number of rows - n_rows = (len(self._tab_names) - 1) // self.max_tabs_per_row + 1 - - # not expanding the tabs with more than one row is very ugly - expand_tabs = self.expand_tabs or n_rows > 1 - i = 0 # index in self._tab_names - for row_index in range(n_rows): - # calculate required number of tabs in this row - n_tabs = (len(self._tab_names) - i - 1) // (n_rows - row_index) + 1 - tab_names = self._tab_names[i:i + n_tabs] - i += n_tabs - self._add_tab_row(tab_names, expand_tabs) - - # re-select selected tab so it is properly displayed - selected = self._selected_tab - self.set_selected_tab(None) - if selected in self._tab_names: - self.set_selected_tab(selected) - - class TabButton(Frame): - """A simple tab-like widget.""" - - bw = 2 # borderwidth - - def __init__(self, name, select_command, tab_row, tab_set): - """Constructor arguments: - - name -- The tab's name, which will appear in its button. - - select_command -- The command to be called upon selection of the - tab. It is called with the tab's name as an argument. - - """ - Frame.__init__(self, tab_row, borderwidth=self.bw, relief=RAISED) - - self.name = name - self.select_command = select_command - self.tab_set = tab_set - self.is_last_in_row = False - - self.button = Radiobutton( - self, text=name, command=self._select_event, - padx=5, pady=1, takefocus=FALSE, indicatoron=FALSE, - highlightthickness=0, selectcolor='', borderwidth=0) - self.button.pack(side=LEFT, fill=X, expand=True) - - self._init_masks() - self.set_normal() - - def _select_event(self, *args): - """Event handler for tab selection. - - With TabbedPageSet, this calls TabbedPageSet.change_page, so that - selecting a tab changes the page. - - Note that this does -not- call set_selected -- it will be called by - TabSet.set_selected_tab, which should be called when whatever the - tabs are related to changes. - - """ - self.select_command(self.name) - return - - def set_selected(self): - """Assume selected look""" - self._place_masks(selected=True) - - def set_normal(self): - """Assume normal look""" - self._place_masks(selected=False) - - def _init_masks(self): - page_set = self.tab_set.page_set - background = page_set.pages_frame.cget('background') - # mask replaces the middle of the border with the background color - self.mask = Frame(page_set, borderwidth=0, relief=FLAT, - background=background) - # mskl replaces the bottom-left corner of the border with a normal - # left border - self.mskl = Frame(page_set, borderwidth=0, relief=FLAT, - background=background) - self.mskl.ml = Frame(self.mskl, borderwidth=self.bw, - relief=RAISED) - self.mskl.ml.place(x=0, y=-self.bw, - width=2*self.bw, height=self.bw*4) - # mskr replaces the bottom-right corner of the border with a normal - # right border - self.mskr = Frame(page_set, borderwidth=0, relief=FLAT, - background=background) - self.mskr.mr = Frame(self.mskr, borderwidth=self.bw, - relief=RAISED) - - def _place_masks(self, selected=False): - height = self.bw - if selected: - height += self.bw - - self.mask.place(in_=self, - relx=0.0, x=0, - rely=1.0, y=0, - relwidth=1.0, width=0, - relheight=0.0, height=height) - - self.mskl.place(in_=self, - relx=0.0, x=-self.bw, - rely=1.0, y=0, - relwidth=0.0, width=self.bw, - relheight=0.0, height=height) - - page_set = self.tab_set.page_set - if selected and ((not self.is_last_in_row) or - (self.winfo_rootx() + self.winfo_width() < - page_set.winfo_rootx() + page_set.winfo_width()) - ): - # for a selected tab, if its rightmost edge isn't on the - # rightmost edge of the page set, the right mask should be one - # borderwidth shorter (vertically) - height -= self.bw - - self.mskr.place(in_=self, - relx=1.0, x=0, - rely=1.0, y=0, - relwidth=0.0, width=self.bw, - relheight=0.0, height=height) - - self.mskr.mr.place(x=-self.bw, y=-self.bw, - width=2*self.bw, height=height + self.bw*2) - - # finally, lower the tab set so that all of the frames we just - # placed hide it - self.tab_set.lower() - - -class TabbedPageSet(Frame): - """A Tkinter tabbed-pane widget. - - Constains set of 'pages' (or 'panes') with tabs above for selecting which - page is displayed. Only one page will be displayed at a time. - - Pages may be accessed through the 'pages' attribute, which is a dictionary - of pages, using the name given as the key. A page is an instance of a - subclass of Tk's Frame widget. - - The page widgets will be created (and destroyed when required) by the - TabbedPageSet. Do not call the page's pack/place/grid/destroy methods. - - Pages may be added or removed at any time using the add_page() and - remove_page() methods. - - """ - - class Page(object): - """Abstract base class for TabbedPageSet's pages. - - Subclasses must override the _show() and _hide() methods. - - """ - uses_grid = False - - def __init__(self, page_set): - self.frame = Frame(page_set, borderwidth=2, relief=RAISED) - - def _show(self): - raise NotImplementedError - - def _hide(self): - raise NotImplementedError - - class PageRemove(Page): - """Page class using the grid placement manager's "remove" mechanism.""" - uses_grid = True - - def _show(self): - self.frame.grid(row=0, column=0, sticky=NSEW) - - def _hide(self): - self.frame.grid_remove() - - class PageLift(Page): - """Page class using the grid placement manager's "lift" mechanism.""" - uses_grid = True - - def __init__(self, page_set): - super(TabbedPageSet.PageLift, self).__init__(page_set) - self.frame.grid(row=0, column=0, sticky=NSEW) - self.frame.lower() - - def _show(self): - self.frame.lift() - - def _hide(self): - self.frame.lower() - - class PagePackForget(Page): - """Page class using the pack placement manager's "forget" mechanism.""" - def _show(self): - self.frame.pack(fill=BOTH, expand=True) - - def _hide(self): - self.frame.pack_forget() - - def __init__(self, parent, page_names=None, page_class=PageLift, - n_rows=1, max_tabs_per_row=5, expand_tabs=False, - **kw): - """Constructor arguments: - - page_names -- A list of strings, each will be the dictionary key to a - page's widget, and the name displayed on the page's tab. Should be - specified in the desired page order. The first page will be the default - and first active page. If page_names is None or empty, the - TabbedPageSet will be initialized empty. - - n_rows, max_tabs_per_row -- Parameters for the TabSet which will - manage the tabs. See TabSet's docs for details. - - page_class -- Pages can be shown/hidden using three mechanisms: - - * PageLift - All pages will be rendered one on top of the other. When - a page is selected, it will be brought to the top, thus hiding all - other pages. Using this method, the TabbedPageSet will not be resized - when pages are switched. (It may still be resized when pages are - added/removed.) - - * PageRemove - When a page is selected, the currently showing page is - hidden, and the new page shown in its place. Using this method, the - TabbedPageSet may resize when pages are changed. - - * PagePackForget - This mechanism uses the pack placement manager. - When a page is shown it is packed, and when it is hidden it is - unpacked (i.e. pack_forget). This mechanism may also cause the - TabbedPageSet to resize when the page is changed. - - """ - Frame.__init__(self, parent, **kw) - - self.page_class = page_class - self.pages = {} - self._pages_order = [] - self._current_page = None - self._default_page = None - - self.columnconfigure(0, weight=1) - self.rowconfigure(1, weight=1) - - self.pages_frame = Frame(self) - self.pages_frame.grid(row=1, column=0, sticky=NSEW) - if self.page_class.uses_grid: - self.pages_frame.columnconfigure(0, weight=1) - self.pages_frame.rowconfigure(0, weight=1) - - # the order of the following commands is important - self._tab_set = TabSet(self, self.change_page, n_rows=n_rows, - max_tabs_per_row=max_tabs_per_row, - expand_tabs=expand_tabs) - if page_names: - for name in page_names: - self.add_page(name) - self._tab_set.grid(row=0, column=0, sticky=NSEW) - - self.change_page(self._default_page) - - def add_page(self, page_name): - """Add a new page with the name given in page_name.""" - if not page_name: - raise InvalidNameError("Invalid TabPage name: '%s'" % page_name) - if page_name in self.pages: - raise AlreadyExistsError( - "TabPage named '%s' already exists" % page_name) - - self.pages[page_name] = self.page_class(self.pages_frame) - self._pages_order.append(page_name) - self._tab_set.add_tab(page_name) - - if len(self.pages) == 1: # adding first page - self._default_page = page_name - self.change_page(page_name) - - def remove_page(self, page_name): - """Destroy the page whose name is given in page_name.""" - if not page_name in self.pages: - raise KeyError("No such TabPage: '%s" % page_name) - - self._pages_order.remove(page_name) - - # handle removing last remaining, default, or currently shown page - if len(self._pages_order) > 0: - if page_name == self._default_page: - # set a new default page - self._default_page = self._pages_order[0] - else: - self._default_page = None - - if page_name == self._current_page: - self.change_page(self._default_page) - - self._tab_set.remove_tab(page_name) - page = self.pages.pop(page_name) - page.frame.destroy() - - def change_page(self, page_name): - """Show the page whose name is given in page_name.""" - if self._current_page == page_name: - return - if page_name is not None and page_name not in self.pages: - raise KeyError("No such TabPage: '%s'" % page_name) - - if self._current_page is not None: - self.pages[self._current_page]._hide() - self._current_page = None - - if page_name is not None: - self._current_page = page_name - self.pages[page_name]._show() - - self._tab_set.set_selected_tab(page_name) - - -def _tabbed_pages(parent): # htest # - top=Toplevel(parent) - x, y = map(int, parent.geometry().split('+')[1:]) - top.geometry("+%d+%d" % (x, y + 175)) - top.title("Test tabbed pages") - tabPage=TabbedPageSet(top, page_names=['Foobar','Baz'], n_rows=0, - expand_tabs=False, - ) - tabPage.pack(side=TOP, expand=TRUE, fill=BOTH) - Label(tabPage.pages['Foobar'].frame, text='Foo', pady=20).pack() - Label(tabPage.pages['Foobar'].frame, text='Bar', pady=20).pack() - Label(tabPage.pages['Baz'].frame, text='Baz').pack() - entryPgName=Entry(top) - buttonAdd=Button(top, text='Add Page', - command=lambda:tabPage.add_page(entryPgName.get())) - buttonRemove=Button(top, text='Remove Page', - command=lambda:tabPage.remove_page(entryPgName.get())) - labelPgName=Label(top, text='name of page to add/remove:') - buttonAdd.pack(padx=5, pady=5) - buttonRemove.pack(padx=5, pady=5) - labelPgName.pack(padx=5) - entryPgName.pack(padx=5) - -if __name__ == '__main__': - from idlelib.idle_test.htest import run - run(_tabbed_pages) diff --git a/Misc/NEWS.d/next/IDLE/2017-11-28-21-47-15.bpo-32164.2T2Na8.rst b/Misc/NEWS.d/next/IDLE/2017-11-28-21-47-15.bpo-32164.2T2Na8.rst new file mode 100644 index 00000000000..1db575c3c6d --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2017-11-28-21-47-15.bpo-32164.2T2Na8.rst @@ -0,0 +1,2 @@ +Delete unused file idlelib/tabbedpages.py. Use of TabbedPageSet in +configdialog was replaced by ttk.Notebook.

1 0

bpo-30781: Remove unused imports in idlelib.configdialog. (GH-4627) (#4630)
by Terry Jan Reedy Nov. 28, 2017

Nov. 28, 2017

https://github.com/python/cpython/commit/a8de696dddd4ec46cdadb12cf2d45ebf14… commit: a8de696dddd4ec46cdadb12cf2d45ebf1473659c branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2017-11-28T22:46:32-05:00 summary: bpo-30781: Remove unused imports in idlelib.configdialog. (GH-4627) (#4630) (cherry picked from commit e8f7c78a868834bb53fa0ac903fc87785112f49e) files: M Lib/idlelib/configdialog.py diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index 099f5262b1e..4e8394be928 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -11,8 +11,8 @@ """ 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, CENTER, + TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, + NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW, HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END) from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame, OptionMenu, Notebook, Radiobutton, Scrollbar, Style) @@ -25,7 +25,6 @@ from idlelib.dynoption import DynOptionMenu from idlelib import macosx from idlelib.query import SectionName, HelpSource -from idlelib.tabbedpages import TabbedPageSet from idlelib.textview import view_text from idlelib.autocomplete import AutoComplete from idlelib.codecontext import CodeContext @@ -1443,7 +1442,7 @@ def create_page_keys(self): self.bindingslist['xscrollcommand'] = scroll_target_x.set self.button_new_keys = Button( frame_custom, text='Get New Keys for Selection', - command=self.get_new_keys, state=DISABLED) + command=self.get_new_keys, state='disabled') # frame_key_sets. frames = [Frame(frame_key_sets, padding=2, borderwidth=0) for i in range(2)]

1 0

bpo-32100: Delete unneeded import in idlelib.pathbrowser. (GH-4626) (#4629)
by Terry Jan Reedy Nov. 28, 2017

Nov. 28, 2017

https://github.com/python/cpython/commit/38ecf57306ef25874ef7c44a9875771e90… commit: 38ecf57306ef25874ef7c44a9875771e90faee97 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2017-11-28T22:15:06-05:00 summary: bpo-32100: Delete unneeded import in idlelib.pathbrowser. (GH-4626) (#4629) (cherry picked from commit fd6f8c56b9a757210e8ceaea9edc50e502dc2085) files: M Lib/idlelib/pathbrowser.py diff --git a/Lib/idlelib/pathbrowser.py b/Lib/idlelib/pathbrowser.py index c61ae0f4fb9..6de242d0000 100644 --- a/Lib/idlelib/pathbrowser.py +++ b/Lib/idlelib/pathbrowser.py @@ -3,7 +3,6 @@ import sys from idlelib.browser import ModuleBrowser, ModuleBrowserTreeItem -from idlelib.pyshell import PyShellFileList from idlelib.tree import TreeItem

1 0

bpo-30781: Remove unused imports in idlelib.configdialog. (#4627)
by Terry Jan Reedy Nov. 28, 2017

Nov. 28, 2017

https://github.com/python/cpython/commit/e8f7c78a868834bb53fa0ac903fc877851… commit: e8f7c78a868834bb53fa0ac903fc87785112f49e branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-11-28T21:52:32-05:00 summary: bpo-30781: Remove unused imports in idlelib.configdialog. (#4627) files: M Lib/idlelib/configdialog.py diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index 099f5262b1e..4e8394be928 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -11,8 +11,8 @@ """ 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, CENTER, + TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, + NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW, HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END) from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame, OptionMenu, Notebook, Radiobutton, Scrollbar, Style) @@ -25,7 +25,6 @@ from idlelib.dynoption import DynOptionMenu from idlelib import macosx from idlelib.query import SectionName, HelpSource -from idlelib.tabbedpages import TabbedPageSet from idlelib.textview import view_text from idlelib.autocomplete import AutoComplete from idlelib.codecontext import CodeContext @@ -1443,7 +1442,7 @@ def create_page_keys(self): self.bindingslist['xscrollcommand'] = scroll_target_x.set self.button_new_keys = Button( frame_custom, text='Get New Keys for Selection', - command=self.get_new_keys, state=DISABLED) + command=self.get_new_keys, state='disabled') # frame_key_sets. frames = [Frame(frame_key_sets, padding=2, borderwidth=0) for i in range(2)]

1 0

bpo-32100: Delete unneeded import in idlelib.pathbrowser. (#4626)
by Terry Jan Reedy Nov. 28, 2017

Nov. 28, 2017

https://github.com/python/cpython/commit/fd6f8c56b9a757210e8ceaea9edc50e502… commit: fd6f8c56b9a757210e8ceaea9edc50e502dc2085 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2017-11-28T21:50:21-05:00 summary: bpo-32100: Delete unneeded import in idlelib.pathbrowser. (#4626) files: M Lib/idlelib/pathbrowser.py diff --git a/Lib/idlelib/pathbrowser.py b/Lib/idlelib/pathbrowser.py index c61ae0f4fb9..6de242d0000 100644 --- a/Lib/idlelib/pathbrowser.py +++ b/Lib/idlelib/pathbrowser.py @@ -3,7 +3,6 @@ import sys from idlelib.browser import ModuleBrowser, ModuleBrowserTreeItem -from idlelib.pyshell import PyShellFileList from idlelib.tree import TreeItem

1 0

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

Nov. 28, 2017

Results for project python/master, build date: 2017-11-28 03:02:50-08:00. - commit: a10dc3e - previous commit: c172fc5 - revision date: 2017-11-28 11:15:26+01: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| 0.925% | -0.264% | +5.195% | +7.693% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 0.895% | -1.143% | +20.251% | +15.014% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 0.852% | +0.267% | +21.677% | +13.073% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 1.215% | -1.729% | +18.638% | +13.932% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 3.447% | -0.112% | +6.925% | +11.185% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 2.547% | -0.147% | +10.516% | +10.146% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 0.671% | -1.005% | +6.858% | +10.001% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.745% | -0.056% | +1.159% | +8.425% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 3.384% | -0.404% | +7.905% | +18.075% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 1.447% | -1.452% | +10.797% | +15.146% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.083% | +0.454% | +4.007% | +7.417% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.453% | +0.016% | +5.847% | +4.708% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 0.835% | +0.202% | +3.080% | +4.128% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.114% | -0.040% | +12.918% | +9.702% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.272% | -0.067% | +9.262% | +9.498% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.870% | -0.610% | +4.597% | +12.187% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.729% | +0.121% | +11.038% | +9.434% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 2.553% | -1.833% | +8.542% | +8.394% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 2.518% | -0.773% | +2.161% | +11.053% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 0.703% | -0.214% | +0.435% | +12.222% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.555% | -1.353% | +7.451% | +11.736% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.618% | -0.193% | +47.173% | +12.291% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.281% | -2.092% | +7.024% | +13.537% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.415% | -0.156% | +16.962% | +13.353% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 3.146% | -1.171% | +8.106% | +10.938% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 3.733% | +0.881% | +5.792% | +2.975% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 1.225% | -0.248% | -0.004% | -0.058% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 2.035% | +0.817% | +5.880% | +7.624% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.432% | +0.242% | +4.790% | +9.619% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 0.942% | +0.910% | -0.046% | +20.208% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 2.851% | -0.532% | -2.985% | +22.904% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.629% | +0.159% | +1.264% | +24.289% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 3.227% | +2.202% | +11.813% | +9.767% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.244% | +0.071% | +0.417% | +9.969% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.133% | -0.166% | +10.703% | +5.088% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.099% | -0.138% | +1.952% | +5.079% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.159% | -0.219% | +10.845% | +12.140% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 5.291% | -1.898% | -1.347% | +10.410% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 0.528% | +1.283% | +0.425% | +9.540% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 2.638% | -1.367% | -5.799% | +8.017% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 2.325% | -0.828% | +5.980% | +6.670% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.347% | +0.107% | +8.359% | +14.236% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 3.069% | +0.658% | -1.680% | +2.558% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 2.358% | +0.151% | +26.763% | +8.764% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 1.825% | -0.315% | +4.681% | +2.365% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 0.459% | +0.395% | +13.592% | +8.936% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 0.515% | +0.212% | +1.535% | -10.682% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.694% | +0.114% | +4.928% | +1.355% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.110% | -0.166% | +6.780% | +6.546% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.354% | -0.820% | +5.540% | +5.639% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 4.291% | -1.526% | +18.266% | +8.739% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.737% | -0.627% | +10.963% | +8.143% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.783% | -0.198% | +9.286% | +5.692% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 3.479% | -0.394% | +11.427% | +7.958% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 4.922% | -0.695% | +9.961% | +10.053% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 3.407% | -1.458% | +21.210% | +13.596% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 0.979% | -0.358% | +5.782% | +7.064% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 0.727% | -0.057% | +2.539% | -1.083% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 3.823% | +2.293% | +8.629% | +18.898% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 1.146% | -0.025% | +0.806% | +15.417% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 3.406% | +0.620% | +6.932% | +7.388% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 1.116% | +0.110% | +4.709% | +9.887% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.797% | +0.424% | +1.968% | +8.906% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 2.025% | -0.156% | -7.660% | +13.374% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.078% | -0.219% | +6.503% | +9.763% | +-----+------------------------+--------+------------+------------+------------+ * 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-32110: codecs.StreamReader.read(n) now returns not more than n (GH-4499) (#4623)
by Serhiy Storchaka Nov. 28, 2017

Nov. 28, 2017

https://github.com/python/cpython/commit/fc73c54dae46e6c47dcd4a535f7bc68a46… commit: fc73c54dae46e6c47dcd4a535f7bc68a46b8e398 branch: 2.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-11-29T02:15:43+02:00 summary: bpo-32110: codecs.StreamReader.read(n) now returns not more than n (GH-4499) (#4623) characters/bytes for non-negative n. This makes it compatible with read() methods of other file-like objects. (cherry picked from commit 219c2de5ad0fdac825298bed1bb251f16956c04a) files: A Misc/NEWS.d/next/Library/2017-11-22-09-44-15.bpo-32110.VJa9bo.rst M Lib/codecs.py M Lib/test/test_codecs.py diff --git a/Lib/codecs.py b/Lib/codecs.py index 590238ec502..e120d636bcb 100644 --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -472,15 +472,17 @@ def read(self, size=-1, chars=-1, firstline=False): self.charbuffer = "".join(self.linebuffer) self.linebuffer = None + if chars < 0: + # For compatibility with other read() methods that take a + # single argument + chars = size + # read until we get the required number of characters (if available) while True: # can the request be satisfied from the character buffer? if chars >= 0: if len(self.charbuffer) >= chars: break - elif size >= 0: - if len(self.charbuffer) >= size: - break # we need more data if size < 0: newdata = self.stream.read() diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index efc40cf2c23..0ec8bf5a4b4 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -149,19 +149,33 @@ def getreader(): self.assertEqual(f.read(), ''.join(lines[1:])) self.assertEqual(f.read(), '') + # Issue #32110: Test readline() followed by read(n) + f = getreader() + self.assertEqual(f.readline(), lines[0]) + self.assertEqual(f.read(1), lines[1][0]) + self.assertEqual(f.read(0), '') + self.assertEqual(f.read(100), data[len(lines[0]) + 1:][:100]) + # Issue #16636: Test readline() followed by readlines() f = getreader() self.assertEqual(f.readline(), lines[0]) self.assertEqual(f.readlines(), lines[1:]) self.assertEqual(f.read(), '') - # Test read() followed by read() + # Test read(n) followed by read() f = getreader() self.assertEqual(f.read(size=40, chars=5), data[:5]) self.assertEqual(f.read(), data[5:]) self.assertEqual(f.read(), '') - # Issue #12446: Test read() followed by readlines() + # Issue #32110: Test read(n) followed by read(n) + f = getreader() + self.assertEqual(f.read(size=40, chars=5), data[:5]) + self.assertEqual(f.read(1), data[5]) + self.assertEqual(f.read(0), '') + self.assertEqual(f.read(100), data[6:106]) + + # Issue #12446: Test read(n) followed by readlines() f = getreader() self.assertEqual(f.read(size=40, chars=5), data[:5]) self.assertEqual(f.readlines(), [lines[0][5:]] + lines[1:]) diff --git a/Misc/NEWS.d/next/Library/2017-11-22-09-44-15.bpo-32110.VJa9bo.rst b/Misc/NEWS.d/next/Library/2017-11-22-09-44-15.bpo-32110.VJa9bo.rst new file mode 100644 index 00000000000..b57ff1acaff --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-11-22-09-44-15.bpo-32110.VJa9bo.rst @@ -0,0 +1,3 @@ +``codecs.StreamReader.read(n)`` now returns not more than *n* +characters/bytes for non-negative *n*. This makes it compatible with +``read()`` methods of other file-like objects.

1 0