Mailman 3 July 2015 - Python-checkins

cpython (merge 3.5 -> default): Issue #23779: imaplib raises TypeError if authenticator tries to abort.
by robert.collins 30 Jul '15

30 Jul '15

https://hg.python.org/cpython/rev/0879f2c53289 changeset: 97157:0879f2c53289 parent: 97154:f05fc1a16e53 parent: 97156:b6f04b9d8c12 user: Robert Collins <rbtcollins(a)hp.com> date: Fri Jul 31 09:02:09 2015 +1200 summary: Issue #23779: imaplib raises TypeError if authenticator tries to abort. Patch from Craig Holmquist. files: Lib/imaplib.py | 2 +- Lib/test/test_imaplib.py | 20 ++++++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 25 insertions(+), 1 deletions(-) diff --git a/Lib/imaplib.py b/Lib/imaplib.py --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -1353,7 +1353,7 @@ def process(self, data): ret = self.mech(self.decode(data)) if ret is None: - return '*' # Abort conversation + return b'*' # Abort conversation return self.encode(ret) def encode(self, inp): diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -419,6 +419,26 @@ ret, data = client.login_cram_md5("tim", b"tanstaaftanstaaf") self.assertEqual(ret, "OK") + + @reap_threads + def test_aborted_authentication(self): + + class MyServer(SimpleIMAPHandler): + + def cmd_AUTHENTICATE(self, tag, args): + self._send_textline('+') + self.response = yield + + if self.response == b'*\r\n': + self._send_tagged(tag, 'NO', '[AUTHENTICATIONFAILED] aborted') + else: + self._send_tagged(tag, 'OK', 'MYAUTH successful') + + with self.reaped_pair(MyServer) as (server, client): + with self.assertRaises(imaplib.IMAP4.error): + code, data = client.authenticate('MYAUTH', lambda x: None) + + def test_linetoolong(self): class TooLongHandler(SimpleIMAPHandler): def handle(self): diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -603,6 +603,7 @@ Shane Holloway Rune Holm Thomas Holmes +Craig Holmquist Philip Homburg Naofumi Honda Jeffrey Honig diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,9 @@ Library ------- +- Issue #23779: imaplib raises TypeError if authenticator tries to abort. + Patch from Craig Holmquist. + - Issue #24360: Improve __repr__ of argparse.Namespace() for invalid identifiers. Patch by Matthias Bussonnier. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Merge with 3.4
by terry.reedy 30 Jul '15

30 Jul '15

https://hg.python.org/cpython/rev/3dd296430cc7 changeset: 97153:3dd296430cc7 branch: 3.5 parent: 97148:401c65b0ae3f parent: 97152:6eb4441ed14b user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Jul 30 16:44:41 2015 -0400 summary: Merge with 3.4 files: Doc/library/idle.rst | 2 -- Lib/idlelib/EditorWindow.py | 7 ++++--- Lib/idlelib/help.txt | 4 +--- Lib/idlelib/macosxSupport.py | 5 +++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -37,8 +37,6 @@ IDLE's menus dynamically change based on which window is currently selected. Each menu documented below indicates which window type it is associated with. -Click on the dotted line at the top of a menu to "tear it off": a separate -window containing the menu is created (for Unix and Windows only). File menu (Shell and Editor) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -447,14 +447,15 @@ self.menudict = menudict = {} for name, label in self.menu_specs: underline, label = prepstr(label) - menudict[name] = menu = Menu(mbar, name=name) + menudict[name] = menu = Menu(mbar, name=name, tearoff=0) mbar.add_cascade(label=label, menu=menu, underline=underline) if macosxSupport.isCarbonTk(): # Insert the application menu - menudict['application'] = menu = Menu(mbar, name='apple') + menudict['application'] = menu = Menu(mbar, name='apple', + tearoff=0) mbar.add_cascade(label='IDLE', menu=menu) self.fill_menus() - self.recent_files_menu = Menu(self.menubar) + self.recent_files_menu = Menu(self.menubar, tearoff=0) self.menudict['file'].insert_cascade(3, label='Recent Files', underline=0, menu=self.recent_files_menu) diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -15,9 +15,7 @@ IDLE has two window types the Shell window and the Editor window. It is possible to have multiple editor windows simultaneously. IDLE's menus dynamically change based on which window is currently selected. Each menu -documented below indicates which window type it is associated with. Click on -the dotted line at the top of a menu to "tear it off": a separate window -containing the menu is created (for Unix and Windows only). +documented below indicates which window type it is associated with. File Menu (Shell and Editor): diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -145,7 +145,7 @@ root.configure(menu=menubar) menudict = {} - menudict['windows'] = menu = Menu(menubar, name='windows') + menudict['windows'] = menu = Menu(menubar, name='windows', tearoff=0) menubar.add_cascade(label='Window', menu=menu, underline=0) def postwindowsmenu(menu=menu): @@ -191,7 +191,8 @@ if isCarbonTk(): # for Carbon AquaTk, replace the default Tk apple menu - menudict['application'] = menu = Menu(menubar, name='apple') + menudict['application'] = menu = Menu(menubar, name='apple', + tearoff=0) menubar.add_cascade(label='IDLE', menu=menu) Bindings.menudefs.insert(0, ('application', [ -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge with 3.5
by terry.reedy 30 Jul '15

30 Jul '15

https://hg.python.org/cpython/rev/f05fc1a16e53 changeset: 97154:f05fc1a16e53 parent: 97149:7ada3cc41e2a parent: 97153:3dd296430cc7 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Jul 30 16:44:55 2015 -0400 summary: Merge with 3.5 files: Doc/library/idle.rst | 2 -- Lib/idlelib/EditorWindow.py | 7 ++++--- Lib/idlelib/help.txt | 4 +--- Lib/idlelib/macosxSupport.py | 5 +++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -37,8 +37,6 @@ IDLE's menus dynamically change based on which window is currently selected. Each menu documented below indicates which window type it is associated with. -Click on the dotted line at the top of a menu to "tear it off": a separate -window containing the menu is created (for Unix and Windows only). File menu (Shell and Editor) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -447,14 +447,15 @@ self.menudict = menudict = {} for name, label in self.menu_specs: underline, label = prepstr(label) - menudict[name] = menu = Menu(mbar, name=name) + menudict[name] = menu = Menu(mbar, name=name, tearoff=0) mbar.add_cascade(label=label, menu=menu, underline=underline) if macosxSupport.isCarbonTk(): # Insert the application menu - menudict['application'] = menu = Menu(mbar, name='apple') + menudict['application'] = menu = Menu(mbar, name='apple', + tearoff=0) mbar.add_cascade(label='IDLE', menu=menu) self.fill_menus() - self.recent_files_menu = Menu(self.menubar) + self.recent_files_menu = Menu(self.menubar, tearoff=0) self.menudict['file'].insert_cascade(3, label='Recent Files', underline=0, menu=self.recent_files_menu) diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -15,9 +15,7 @@ IDLE has two window types the Shell window and the Editor window. It is possible to have multiple editor windows simultaneously. IDLE's menus dynamically change based on which window is currently selected. Each menu -documented below indicates which window type it is associated with. Click on -the dotted line at the top of a menu to "tear it off": a separate window -containing the menu is created (for Unix and Windows only). +documented below indicates which window type it is associated with. File Menu (Shell and Editor): diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -145,7 +145,7 @@ root.configure(menu=menubar) menudict = {} - menudict['windows'] = menu = Menu(menubar, name='windows') + menudict['windows'] = menu = Menu(menubar, name='windows', tearoff=0) menubar.add_cascade(label='Window', menu=menu, underline=0) def postwindowsmenu(menu=menu): @@ -191,7 +191,8 @@ if isCarbonTk(): # for Carbon AquaTk, replace the default Tk apple menu - menudict['application'] = menu = Menu(menubar, name='apple') + menudict['application'] = menu = Menu(menubar, name='apple', + tearoff=0) menubar.add_cascade(label='IDLE', menu=menu) Bindings.menudefs.insert(0, ('application', [ -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #13884: Idle: Remove tearoff lines from menus. Patch by Roger Serwy.
by terry.reedy 30 Jul '15

30 Jul '15

https://hg.python.org/cpython/rev/bead9330438c changeset: 97151:bead9330438c branch: 2.7 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Jul 30 16:44:09 2015 -0400 summary: Issue #13884: Idle: Remove tearoff lines from menus. Patch by Roger Serwy. files: Doc/library/idle.rst | 2 -- Lib/idlelib/EditorWindow.py | 7 ++++--- Lib/idlelib/help.txt | 3 --- Lib/idlelib/macosxSupport.py | 5 +++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -37,8 +37,6 @@ IDLE's menus dynamically change based on which window is currently selected. Each menu documented below indicates which window type it is associated with. -Click on the dotted line at the top of a menu to "tear it off": a separate -window containing the menu is created (for Unix and Windows only). File menu (Shell and Editor) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -316,7 +316,7 @@ io.set_filename_change_hook(self.filename_change_hook) # Create the recent files submenu - self.recent_files_menu = Menu(self.menubar) + self.recent_files_menu = Menu(self.menubar, tearoff=0) self.menudict['file'].insert_cascade(3, label='Recent Files', underline=0, menu=self.recent_files_menu) @@ -477,12 +477,13 @@ self.menudict = menudict = {} for name, label in self.menu_specs: underline, label = prepstr(label) - menudict[name] = menu = Menu(mbar, name=name) + menudict[name] = menu = Menu(mbar, name=name, tearoff=0) mbar.add_cascade(label=label, menu=menu, underline=underline) if macosxSupport.isCarbonTk(): # Insert the application menu - menudict['application'] = menu = Menu(mbar, name='apple') + menudict['application'] = menu = Menu(mbar, name='apple', + tearoff=0) mbar.add_cascade(label='IDLE', menu=menu) self.fill_menus() diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -1,8 +1,5 @@ [See the end of this file for ** TIPS ** on using IDLE !!] -Click on the dotted line at the top of a menu to "tear it off": a -separate window containing the menu is created. - File Menu: New File -- Create a new editing window diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -147,7 +147,7 @@ root.configure(menu=menubar) menudict = {} - menudict['windows'] = menu = Menu(menubar, name='windows') + menudict['windows'] = menu = Menu(menubar, name='windows', tearoff=0) menubar.add_cascade(label='Window', menu=menu, underline=0) def postwindowsmenu(menu=menu): @@ -187,7 +187,8 @@ if isCarbonTk(): # for Carbon AquaTk, replace the default Tk apple menu - menudict['application'] = menu = Menu(menubar, name='apple') + menudict['application'] = menu = Menu(menubar, name='apple', + tearoff=0) menubar.add_cascade(label='IDLE', menu=menu) Bindings.menudefs.insert(0, ('application', [ -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue #13884: Idle: Remove tearoff lines from menus. Patch by Roger Serwy.
by terry.reedy 30 Jul '15

30 Jul '15

https://hg.python.org/cpython/rev/6eb4441ed14b changeset: 97152:6eb4441ed14b branch: 3.4 parent: 97145:f9694502f07c user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Jul 30 16:44:22 2015 -0400 summary: Issue #13884: Idle: Remove tearoff lines from menus. Patch by Roger Serwy. files: Doc/library/idle.rst | 2 -- Lib/idlelib/EditorWindow.py | 7 ++++--- Lib/idlelib/help.txt | 4 +--- Lib/idlelib/macosxSupport.py | 5 +++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -37,8 +37,6 @@ IDLE's menus dynamically change based on which window is currently selected. Each menu documented below indicates which window type it is associated with. -Click on the dotted line at the top of a menu to "tear it off": a separate -window containing the menu is created (for Unix and Windows only). File menu (Shell and Editor) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -447,14 +447,15 @@ self.menudict = menudict = {} for name, label in self.menu_specs: underline, label = prepstr(label) - menudict[name] = menu = Menu(mbar, name=name) + menudict[name] = menu = Menu(mbar, name=name, tearoff=0) mbar.add_cascade(label=label, menu=menu, underline=underline) if macosxSupport.isCarbonTk(): # Insert the application menu - menudict['application'] = menu = Menu(mbar, name='apple') + menudict['application'] = menu = Menu(mbar, name='apple', + tearoff=0) mbar.add_cascade(label='IDLE', menu=menu) self.fill_menus() - self.recent_files_menu = Menu(self.menubar) + self.recent_files_menu = Menu(self.menubar, tearoff=0) self.menudict['file'].insert_cascade(3, label='Recent Files', underline=0, menu=self.recent_files_menu) diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -15,9 +15,7 @@ IDLE has two window types the Shell window and the Editor window. It is possible to have multiple editor windows simultaneously. IDLE's menus dynamically change based on which window is currently selected. Each menu -documented below indicates which window type it is associated with. Click on -the dotted line at the top of a menu to "tear it off": a separate window -containing the menu is created (for Unix and Windows only). +documented below indicates which window type it is associated with. File Menu (Shell and Editor): diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -145,7 +145,7 @@ root.configure(menu=menubar) menudict = {} - menudict['windows'] = menu = Menu(menubar, name='windows') + menudict['windows'] = menu = Menu(menubar, name='windows', tearoff=0) menubar.add_cascade(label='Window', menu=menu, underline=0) def postwindowsmenu(menu=menu): @@ -191,7 +191,8 @@ if isCarbonTk(): # for Carbon AquaTk, replace the default Tk apple menu - menudict['application'] = menu = Menu(menubar, name='apple') + menudict['application'] = menu = Menu(menubar, name='apple', + tearoff=0) menubar.add_cascade(label='IDLE', menu=menu) Bindings.menudefs.insert(0, ('application', [ -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #12160: Fix incorrect StreamCodec references in Codec.encode() and
by berker.peksag 30 Jul '15

30 Jul '15

https://hg.python.org/cpython/rev/296a09614f31 changeset: 97150:296a09614f31 branch: 2.7 parent: 97142:309cbbc32491 user: Berker Peksag <berker.peksag(a)gmail.com> date: Thu Jul 30 23:27:13 2015 +0300 summary: Issue #12160: Fix incorrect StreamCodec references in Codec.encode() and Codec.decode() docs. It should StreamWriter for Codecs.encode() and StreamReader for Codec.decode(). Patch by Nick Weinhold. files: Doc/library/codecs.rst | 8 ++++---- Lib/codecs.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -392,8 +392,8 @@ handling. The method may not store state in the :class:`Codec` instance. Use - :class:`StreamCodec` for codecs which have to keep state in order to make - encoding/decoding efficient. + :class:`StreamWriter` for codecs which have to keep state in order to make + encoding efficient. The encoder must be able to handle zero length input and return an empty object of the output object type in this situation. @@ -413,8 +413,8 @@ handling. The method may not store state in the :class:`Codec` instance. Use - :class:`StreamCodec` for codecs which have to keep state in order to make - encoding/decoding efficient. + :class:`StreamReader` for codecs which have to keep state in order to make + decoding efficient. The decoder must be able to handle zero length input and return an empty object of the output object type in this situation. diff --git a/Lib/codecs.py b/Lib/codecs.py --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -138,8 +138,8 @@ 'strict' handling. The method may not store state in the Codec instance. Use - StreamCodec for codecs which have to keep state in order to - make encoding/decoding efficient. + StreamWriter for codecs which have to keep state in order to + make encoding efficient. The encoder must be able to handle zero length input and return an empty object of the output object type in this @@ -161,8 +161,8 @@ 'strict' handling. The method may not store state in the Codec instance. Use - StreamCodec for codecs which have to keep state in order to - make encoding/decoding efficient. + StreamReader for codecs which have to keep state in order to + make decoding efficient. The decoder must be able to handle zero length input and return an empty object of the output object type in this -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Update default msvccompiler link options to match the options used for core
by steve.dower 30 Jul '15

30 Jul '15

https://hg.python.org/cpython/rev/7ada3cc41e2a changeset: 97149:7ada3cc41e2a parent: 97147:d3b20bff9c5d parent: 97148:401c65b0ae3f user: Steve Dower <steve.dower(a)microsoft.com> date: Thu Jul 30 11:51:30 2015 -0700 summary: Update default msvccompiler link options to match the options used for core builds. files: Lib/distutils/_msvccompiler.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py --- a/Lib/distutils/_msvccompiler.py +++ b/Lib/distutils/_msvccompiler.py @@ -207,10 +207,10 @@ ] self.ldflags_shared = [ - '/nologo', '/DLL', '/INCREMENTAL:NO' + '/nologo', '/DLL', '/INCREMENTAL:NO', '/LTCG', '/nodefaultlib:libucrt.lib', 'ucrt.lib' ] self.ldflags_shared_debug = [ - '/nologo', '/DLL', '/INCREMENTAL:no', '/DEBUG:FULL' + '/nologo', '/DLL', '/INCREMENTAL:no', '/LTCG', '/DEBUG:FULL', '/nodefaultlib:libucrtd.lib', 'ucrtd.lib' ] self.ldflags_static = [ '/nologo' -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Update default msvccompiler link options to match the options used for core
by steve.dower 30 Jul '15

30 Jul '15

https://hg.python.org/cpython/rev/401c65b0ae3f changeset: 97148:401c65b0ae3f branch: 3.5 parent: 97146:98631f35426f user: Steve Dower <steve.dower(a)microsoft.com> date: Thu Jul 30 11:51:06 2015 -0700 summary: Update default msvccompiler link options to match the options used for core builds. This ensures that wheels will work when moved to machines that have the same subset of the MSVC libraries as a regular CPython install. Specifically, vcruntime##0.dll may not be installed, and should not be a dependency. files: Lib/distutils/_msvccompiler.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py --- a/Lib/distutils/_msvccompiler.py +++ b/Lib/distutils/_msvccompiler.py @@ -207,10 +207,10 @@ ] self.ldflags_shared = [ - '/nologo', '/DLL', '/INCREMENTAL:NO' + '/nologo', '/DLL', '/INCREMENTAL:NO', '/LTCG', '/nodefaultlib:libucrt.lib', 'ucrt.lib' ] self.ldflags_shared_debug = [ - '/nologo', '/DLL', '/INCREMENTAL:no', '/DEBUG:FULL' + '/nologo', '/DLL', '/INCREMENTAL:no', '/LTCG', '/DEBUG:FULL', '/nodefaultlib:libucrtd.lib', 'ucrtd.lib' ] self.ldflags_static = [ '/nologo' -- Repository URL: https://hg.python.org/cpython

1 0

devguide: Write my name correctly
by jesus.cea 30 Jul '15

30 Jul '15

https://hg.python.org/devguide/rev/da60478118e7 changeset: 756:da60478118e7 user: Jesus Cea <jcea(a)jcea.es> date: Thu Jul 30 19:55:58 2015 +0200 summary: Write my name correctly files: developers.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/developers.rst b/developers.rst --- a/developers.rst +++ b/developers.rst @@ -241,7 +241,7 @@ - Heiko Weinen was given SVN access on 29 April 2008 by MvL, for GSoC contributions. -- Jesus Cea was given SVN access on 24 April 2008 by MvL, +- Jesús Cea was given SVN access on 24 April 2008 by MvL, for maintenance of bsddb. - Guilherme Polo was given SVN access on 24 April 2008 by MvL, -- Repository URL: https://hg.python.org/devguide

1 0

cpython (merge 3.4 -> 3.5): Issue #12160: Fix incorrect StreamCodec references in Codec.encode() and
by berker.peksag 30 Jul '15

30 Jul '15

https://hg.python.org/cpython/rev/98631f35426f changeset: 97146:98631f35426f branch: 3.5 parent: 97143:4476b578b8fd parent: 97145:f9694502f07c user: Berker Peksag <berker.peksag(a)gmail.com> date: Thu Jul 30 18:26:35 2015 +0300 summary: Issue #12160: Fix incorrect StreamCodec references in Codec.encode() and Codec.decode() docs. It should StreamWriter for Codecs.encode() and StreamReader for Codec.decode(). Patch by Nick Weinhold. files: Doc/library/codecs.rst | 8 ++++---- Lib/codecs.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -454,8 +454,8 @@ It defaults to ``'strict'`` handling. The method may not store state in the :class:`Codec` instance. Use - :class:`StreamCodec` for codecs which have to keep state in order to make - encoding/decoding efficient. + :class:`StreamWriter` for codecs which have to keep state in order to make + encoding efficient. The encoder must be able to handle zero length input and return an empty object of the output object type in this situation. @@ -476,8 +476,8 @@ It defaults to ``'strict'`` handling. The method may not store state in the :class:`Codec` instance. Use - :class:`StreamCodec` for codecs which have to keep state in order to make - encoding/decoding efficient. + :class:`StreamReader` for codecs which have to keep state in order to make + decoding efficient. The decoder must be able to handle zero length input and return an empty object of the output object type in this situation. diff --git a/Lib/codecs.py b/Lib/codecs.py --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -143,8 +143,8 @@ 'strict' handling. The method may not store state in the Codec instance. Use - StreamCodec for codecs which have to keep state in order to - make encoding/decoding efficient. + StreamWriter for codecs which have to keep state in order to + make encoding efficient. The encoder must be able to handle zero length input and return an empty object of the output object type in this @@ -166,8 +166,8 @@ 'strict' handling. The method may not store state in the Codec instance. Use - StreamCodec for codecs which have to keep state in order to - make encoding/decoding efficient. + StreamReader for codecs which have to keep state in order to + make decoding efficient. The decoder must be able to handle zero length input and return an empty object of the output object type in this -- Repository URL: https://hg.python.org/cpython

1 0