Mailman 3 November 2013 - Python-checkins

cpython: asyncio: Use Interface instead of ABC. Fixes issue 19726.
by guido.van.rossum 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/5469e1a68dbd changeset: 87664:5469e1a68dbd user: Guido van Rossum <guido(a)python.org> date: Sat Nov 30 15:35:42 2013 -0800 summary: asyncio: Use Interface instead of ABC. Fixes issue 19726. files: Lib/asyncio/events.py | 4 ++-- Lib/asyncio/protocols.py | 8 ++++---- Lib/asyncio/transports.py | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py --- a/Lib/asyncio/events.py +++ b/Lib/asyncio/events.py @@ -234,7 +234,7 @@ protocol_factory should instantiate object with Protocol interface. pipe is file-like object already switched to nonblocking. Return pair (transport, protocol), where transport support - ReadTransport ABC""" + ReadTransport interface.""" # The reason to accept file-like object instead of just file descriptor # is: we need to own pipe and close it at transport finishing # Can got complicated errors if pass f.fileno(), @@ -247,7 +247,7 @@ protocol_factory should instantiate object with BaseProtocol interface. Pipe is file-like object already switched to nonblocking. Return pair (transport, protocol), where transport support - WriteTransport ABC""" + WriteTransport interface.""" # The reason to accept file-like object instead of just file descriptor # is: we need to own pipe and close it at transport finishing # Can got complicated errors if pass f.fileno(), diff --git a/Lib/asyncio/protocols.py b/Lib/asyncio/protocols.py --- a/Lib/asyncio/protocols.py +++ b/Lib/asyncio/protocols.py @@ -4,7 +4,7 @@ class BaseProtocol: - """ABC for base protocol class. + """Common base class for protocol interfaces. Usually user implements protocols that derived from BaseProtocol like Protocol or ProcessProtocol. @@ -59,7 +59,7 @@ class Protocol(BaseProtocol): - """ABC representing a protocol. + """Interface for stream protocol. The user should implement this interface. They can inherit from this class but don't need to. The implementations here do @@ -95,7 +95,7 @@ class DatagramProtocol(BaseProtocol): - """ABC representing a datagram protocol.""" + """Interface for datagram protocol.""" def datagram_received(self, data, addr): """Called when some datagram is received.""" @@ -108,7 +108,7 @@ class SubprocessProtocol(BaseProtocol): - """ABC representing a protocol for subprocess calls.""" + """Interface for protocol for subprocess calls.""" def pipe_data_received(self, fd, data): """Called when the subprocess writes data into stdout/stderr pipe. diff --git a/Lib/asyncio/transports.py b/Lib/asyncio/transports.py --- a/Lib/asyncio/transports.py +++ b/Lib/asyncio/transports.py @@ -4,7 +4,7 @@ class BaseTransport: - """Base ABC for transports.""" + """Base class for transports.""" def __init__(self, extra=None): if extra is None: @@ -27,7 +27,7 @@ class ReadTransport(BaseTransport): - """ABC for read-only transports.""" + """Interface for read-only transports.""" def pause_reading(self): """Pause the receiving end. @@ -47,7 +47,7 @@ class WriteTransport(BaseTransport): - """ABC for write-only transports.""" + """Interface for write-only transports.""" def set_write_buffer_limits(self, high=None, low=None): """Set the high- and low-water limits for write flow control. @@ -115,7 +115,7 @@ class Transport(ReadTransport, WriteTransport): - """ABC representing a bidirectional transport. + """Interface representing a bidirectional transport. There may be several implementations, but typically, the user does not implement new transports; rather, the platform provides some @@ -137,7 +137,7 @@ class DatagramTransport(BaseTransport): - """ABC for datagram (UDP) transports.""" + """Interface for datagram (UDP) transports.""" def sendto(self, data, addr=None): """Send data to the transport. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #19845: Updated the Compiling Python on Windows docs.
by zach.ware 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/f4eedd29706b changeset: 87663:f4eedd29706b parent: 87661:eae4b83108fb parent: 87662:a239897084bf user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Nov 30 17:03:03 2013 -0600 summary: Issue #19845: Updated the Compiling Python on Windows docs. files: Doc/using/windows.rst | 22 +++++++++------------- Misc/NEWS | 2 ++ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -556,27 +556,23 @@ latest release's source or just grab a fresh `checkout <http://docs.python.org/devguide/setup#checking-out-the-code>`_. -For Microsoft Visual C++, which is the compiler with which official Python -releases are built, the source tree contains solutions/project files. View the -:file:`readme.txt` in their respective directories: +The source tree contains a build solution and project files for Microsoft +Visual C++, which is the compiler used to build the official Python releases. +View the :file:`readme.txt` in their respective directories: +--------------------+--------------+-----------------------+ | Directory | MSVC version | Visual Studio version | +====================+==============+=======================+ -| :file:`PC/VC6/` | 6.0 | 97 | +| :file:`PC/VS9.0/` | 9.0 | 2008 | +--------------------+--------------+-----------------------+ -| :file:`PC/VS7.1/` | 7.1 | 2003 | -+--------------------+--------------+-----------------------+ -| :file:`PC/VS8.0/` | 8.0 | 2005 | -+--------------------+--------------+-----------------------+ -| :file:`PCbuild/` | 9.0 | 2008 | +| :file:`PCbuild/` | 10.0 | 2010 | +--------------------+--------------+-----------------------+ -Note that not all of these build directories are fully supported. Read the -release notes to see which compiler version the official releases for your -version are built with. +Note that any build directories within the :file:`PC` directory are not +necessarily fully supported. The :file:`PCbuild` directory contains the files +for the compiler used to build the official release. -Check :file:`PC/readme.txt` for general information on the build process. +Check :file:`PCbuild/readme.txt` for general information on the build process. For extension modules, consult :ref:`building-on-windows`. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -63,6 +63,8 @@ Documentation ------------- +- Issue #19845: Updated the Compiling Python on Windows section. + - Issue #19795: Improved markup of True/False constants. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #19845: Updated the Compiling Python on Windows docs.
by zach.ware 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/a239897084bf changeset: 87662:a239897084bf branch: 3.3 parent: 87660:5c8130b85c17 user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Nov 30 16:59:33 2013 -0600 summary: Issue #19845: Updated the Compiling Python on Windows docs. files: Doc/using/windows.rst | 18 ++++++++++-------- Misc/NEWS | 2 ++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -556,9 +556,9 @@ latest release's source or just grab a fresh `checkout <http://docs.python.org/devguide/setup#checking-out-the-code>`_. -For Microsoft Visual C++, which is the compiler with which official Python -releases are built, the source tree contains solutions/project files. View the -:file:`readme.txt` in their respective directories: +The source tree contains a build solution and project files for Microsoft +Visual C++, which is the compiler used to build the official Python releases. +View the :file:`readme.txt` in their respective directories: +--------------------+--------------+-----------------------+ | Directory | MSVC version | Visual Studio version | @@ -569,14 +569,16 @@ +--------------------+--------------+-----------------------+ | :file:`PC/VS8.0/` | 8.0 | 2005 | +--------------------+--------------+-----------------------+ -| :file:`PCbuild/` | 9.0 | 2008 | +| :file:`PC/VS9.0/` | 9.0 | 2008 | ++--------------------+--------------+-----------------------+ +| :file:`PCbuild/` | 10.0 | 2010 | +--------------------+--------------+-----------------------+ -Note that not all of these build directories are fully supported. Read the -release notes to see which compiler version the official releases for your -version are built with. +Note that any build directories within the :file:`PC` directory are not +necessarily fully supported. The :file:`PCbuild` directory contains the files +for the compiler used to build the official release. -Check :file:`PC/readme.txt` for general information on the build process. +Check :file:`PCbuild/readme.txt` for general information on the build process. For extension modules, consult :ref:`building-on-windows`. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -95,6 +95,8 @@ Documentation ------------- +- Issue #19845: Updated the Compiling Python on Windows section. + - Issue #19795: Improved markup of True/False constants. - Issue #18326: Clarify that list.sort's arguments are keyword-only. Also, -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Closes #19789: Merged update from 3.3.
by vinay.sajip 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/eae4b83108fb changeset: 87661:eae4b83108fb parent: 87657:f20d966dc499 parent: 87660:5c8130b85c17 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Nov 30 22:46:29 2013 +0000 summary: Closes #19789: Merged update from 3.3. files: Doc/library/logging.rst | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -987,8 +987,10 @@ effect is to disable all logging calls of severity *lvl* and below, so that if you call it with a value of INFO, then all INFO and DEBUG events would be discarded, whereas those of severity WARNING and above would be processed - according to the logger's effective level. To undo the effect of a call to - ``logging.disable(lvl)``, call ``logging.disable(logging.NOTSET)``. + according to the logger's effective level. If + ``logging.disable(logging.NOTSET)`` is called, it effectively removes this + overriding level, so that logging output again depends on the effective + levels of individual loggers. .. function:: addLevelName(lvl, levelName) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #19789: Clarified documentation for logging.disable.
by vinay.sajip 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/5c8130b85c17 changeset: 87660:5c8130b85c17 branch: 3.3 parent: 87656:b92f9eaedb76 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Nov 30 22:45:29 2013 +0000 summary: Issue #19789: Clarified documentation for logging.disable. files: Doc/library/logging.rst | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -987,8 +987,10 @@ effect is to disable all logging calls of severity *lvl* and below, so that if you call it with a value of INFO, then all INFO and DEBUG events would be discarded, whereas those of severity WARNING and above would be processed - according to the logger's effective level. To undo the effect of a call to - ``logging.disable(lvl)``, call ``logging.disable(logging.NOTSET)``. + according to the logger's effective level. If + ``logging.disable(logging.NOTSET)`` is called, it effectively removes this + overriding level, so that logging output again depends on the effective + levels of individual loggers. .. function:: addLevelName(lvl, levelName) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19789: Clarified documentation for logging.disable.
by vinay.sajip 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/b6377ca8087a changeset: 87659:b6377ca8087a branch: 2.7 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Nov 30 22:43:13 2013 +0000 summary: Issue #19789: Clarified documentation for logging.disable. files: Doc/library/logging.rst | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -837,8 +837,10 @@ effect is to disable all logging calls of severity *lvl* and below, so that if you call it with a value of INFO, then all INFO and DEBUG events would be discarded, whereas those of severity WARNING and above would be processed - according to the logger's effective level. To undo the effect of a call to - ``logging.disable(lvl)``, call ``logging.disable(logging.NOTSET)``. + according to the logger's effective level. If + ``logging.disable(logging.NOTSET)`` is called, it effectively removes this + overriding level, so that logging output again depends on the effective + levels of individual loggers. .. function:: addLevelName(lvl, levelName) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix typo in Misc/NEWS.
by alexandre.vassalotti 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/ce55df8ee815 changeset: 87658:ce55df8ee815 branch: 2.7 parent: 87655:ee627983ba28 user: Alexandre Vassalotti <alexandre(a)peadrop.com> date: Sat Nov 30 14:02:47 2013 -0800 summary: Fix typo in Misc/NEWS. files: Misc/NEWS | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -17,8 +17,8 @@ - Issue #16231: Fixed pickle.Pickler to only fallback to its default pickling behaviour when Pickler.persistent_id returns None, but not for any other - false values. This allows false values other values other than None to be - used as persistent IDs. This behaviour is consistent with cPickle. + false values. This allows false values other than None to be used as + persistent IDs. This behaviour is consistent with cPickle. - Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with virtual interface. Original patch by Kent Frazier. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Merge with 3.3.
by alexandre.vassalotti 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/f20d966dc499 changeset: 87657:f20d966dc499 parent: 87654:d565310e7ae3 parent: 87656:b92f9eaedb76 user: Alexandre Vassalotti <alexandre(a)peadrop.com> date: Sat Nov 30 13:55:39 2013 -0800 summary: Merge with 3.3. files: Lib/test/pickletester.py | 40 +++++++++++++++------------ Misc/NEWS | 3 ++ Modules/_pickle.c | 2 +- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -1785,30 +1785,34 @@ if isinstance(object, int) and object % 2 == 0: self.id_count += 1 return str(object) + elif object == "test_false_value": + self.false_count += 1 + return "" else: return None def persistent_load(self, oid): - self.load_count += 1 - object = int(oid) - assert object % 2 == 0 - return object + if not oid: + self.load_false_count += 1 + return "test_false_value" + else: + self.load_count += 1 + object = int(oid) + assert object % 2 == 0 + return object def test_persistence(self): - self.id_count = 0 - self.load_count = 0 - L = list(range(10)) - self.assertEqual(self.loads(self.dumps(L)), L) - self.assertEqual(self.id_count, 5) - self.assertEqual(self.load_count, 5) - - def test_bin_persistence(self): - self.id_count = 0 - self.load_count = 0 - L = list(range(10)) - self.assertEqual(self.loads(self.dumps(L, 1)), L) - self.assertEqual(self.id_count, 5) - self.assertEqual(self.load_count, 5) + L = list(range(10)) + ["test_false_value"] + for proto in protocols: + self.id_count = 0 + self.false_count = 0 + self.load_false_count = 0 + self.load_count = 0 + self.assertEqual(self.loads(self.dumps(L, proto)), L) + self.assertEqual(self.id_count, 5) + self.assertEqual(self.false_count, 1) + self.assertEqual(self.load_count, 5) + self.assertEqual(self.load_false_count, 1) class AbstractPicklerUnpicklerObjectTests(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -30,6 +30,9 @@ - Issue #19698: Removed exec_module() methods from importlib.machinery.BuiltinImporter and ExtensionFileLoader. +- Fixed _pickle.Unpickler to not fail when loading empty strings as + persistent IDs. + - ssl.create_default_context() sets OP_NO_COMPRESSION to prevent CRIME. - Issue #19802: Add socket.SO_PRIORITY. diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -5355,7 +5355,7 @@ if (self->pers_func) { if ((len = _Unpickler_Readline(self, &s)) < 0) return -1; - if (len < 2) + if (len < 1) return bad_readline(); pid = PyBytes_FromStringAndSize(s, len - 1); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Fixed _pickle.Unpickler to handle empty persistent IDs correctly.
by alexandre.vassalotti 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/b92f9eaedb76 changeset: 87656:b92f9eaedb76 branch: 3.3 parent: 87652:96d1207d33d0 user: Alexandre Vassalotti <alexandre(a)peadrop.com> date: Sat Nov 30 13:52:35 2013 -0800 summary: Fixed _pickle.Unpickler to handle empty persistent IDs correctly. files: Lib/test/pickletester.py | 40 +++++++++++++++------------ Misc/NEWS | 3 ++ Modules/_pickle.c | 2 +- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -1499,30 +1499,34 @@ if isinstance(object, int) and object % 2 == 0: self.id_count += 1 return str(object) + elif object == "test_false_value": + self.false_count += 1 + return "" else: return None def persistent_load(self, oid): - self.load_count += 1 - object = int(oid) - assert object % 2 == 0 - return object + if not oid: + self.load_false_count += 1 + return "test_false_value" + else: + self.load_count += 1 + object = int(oid) + assert object % 2 == 0 + return object def test_persistence(self): - self.id_count = 0 - self.load_count = 0 - L = list(range(10)) - self.assertEqual(self.loads(self.dumps(L)), L) - self.assertEqual(self.id_count, 5) - self.assertEqual(self.load_count, 5) - - def test_bin_persistence(self): - self.id_count = 0 - self.load_count = 0 - L = list(range(10)) - self.assertEqual(self.loads(self.dumps(L, 1)), L) - self.assertEqual(self.id_count, 5) - self.assertEqual(self.load_count, 5) + L = list(range(10)) + ["test_false_value"] + for proto in protocols: + self.id_count = 0 + self.false_count = 0 + self.load_false_count = 0 + self.load_count = 0 + self.assertEqual(self.loads(self.dumps(L, proto)), L) + self.assertEqual(self.id_count, 5) + self.assertEqual(self.false_count, 1) + self.assertEqual(self.load_count, 5) + self.assertEqual(self.load_false_count, 1) class AbstractPicklerUnpicklerObjectTests(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -21,6 +21,9 @@ - Issue #19088: Fixed incorrect caching of the copyreg module in object.__reduce__() and object.__reduce_ex__(). +- Fixed _pickle.Unpickler to not fail when loading empty strings as + persistent IDs. + - Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with virtual interface. Original patch by Kent Frazier. diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -4665,7 +4665,7 @@ if (self->pers_func) { if ((len = _Unpickler_Readline(self, &s)) < 0) return -1; - if (len < 2) + if (len < 1) return bad_readline(); pid = PyBytes_FromStringAndSize(s, len - 1); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #16231: Allow false values other than None to be used as persistent IDs.
by alexandre.vassalotti 01 Dec '13

01 Dec '13

http://hg.python.org/cpython/rev/ee627983ba28 changeset: 87655:ee627983ba28 branch: 2.7 parent: 87644:30b3798782f1 user: Alexandre Vassalotti <alexandre(a)peadrop.com> date: Sat Nov 30 13:24:13 2013 -0800 summary: Issue #16231: Allow false values other than None to be used as persistent IDs. files: Lib/pickle.py | 2 +- Lib/test/pickletester.py | 40 +++++++++++++++------------ Misc/NEWS | 5 +++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/Lib/pickle.py b/Lib/pickle.py --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -269,7 +269,7 @@ def save(self, obj): # Check for persistent id (defined by a subclass) pid = self.persistent_id(obj) - if pid: + if pid is not None: self.save_pers(pid) return diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -1152,30 +1152,34 @@ if isinstance(object, int) and object % 2 == 0: self.id_count += 1 return str(object) + elif object == "test_false_value": + self.false_count += 1 + return "" else: return None def persistent_load(self, oid): - self.load_count += 1 - object = int(oid) - assert object % 2 == 0 - return object + if not oid: + self.load_false_count += 1 + return "test_false_value" + else: + self.load_count += 1 + object = int(oid) + assert object % 2 == 0 + return object def test_persistence(self): - self.id_count = 0 - self.load_count = 0 - L = range(10) - self.assertEqual(self.loads(self.dumps(L)), L) - self.assertEqual(self.id_count, 5) - self.assertEqual(self.load_count, 5) - - def test_bin_persistence(self): - self.id_count = 0 - self.load_count = 0 - L = range(10) - self.assertEqual(self.loads(self.dumps(L, 1)), L) - self.assertEqual(self.id_count, 5) - self.assertEqual(self.load_count, 5) + L = range(10) + ["test_false_value"] + for proto in protocols: + self.id_count = 0 + self.false_count = 0 + self.load_false_count = 0 + self.load_count = 0 + self.assertEqual(self.loads(self.dumps(L, proto)), L) + self.assertEqual(self.id_count, 5) + self.assertEqual(self.false_count, 1) + self.assertEqual(self.load_count, 5) + self.assertEqual(self.load_false_count, 1) class AbstractPicklerUnpicklerObjectTests(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,11 @@ Library ------- +- Issue #16231: Fixed pickle.Pickler to only fallback to its default pickling + behaviour when Pickler.persistent_id returns None, but not for any other + false values. This allows false values other values other than None to be + used as persistent IDs. This behaviour is consistent with cPickle. + - Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with virtual interface. Original patch by Kent Frazier. -- Repository URL: http://hg.python.org/cpython

1 0