Mailman 3 January 2014 - Python-checkins

cpython: asyncio: Future.set_exception(exc) should instantiate exc if it is a class.
by guido.van.rossum Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/354ddb56cc81 changeset: 88839:354ddb56cc81 parent: 88837:73dbb884eb09 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Jan 30 16:01:54 2014 -0800 summary: asyncio: Future.set_exception(exc) should instantiate exc if it is a class. files: Lib/asyncio/futures.py | 2 ++ Lib/test/test_asyncio/test_futures.py | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -301,6 +301,8 @@ """ if self._state != _PENDING: raise InvalidStateError('{}: {!r}'.format(self._state, self)) + if isinstance(exception, type): + exception = exception() self._exception = exception self._state = _FINISHED self._schedule_callbacks() diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py --- a/Lib/test/test_asyncio/test_futures.py +++ b/Lib/test/test_asyncio/test_futures.py @@ -79,6 +79,11 @@ self.assertRaises(asyncio.InvalidStateError, f.set_exception, None) self.assertFalse(f.cancel()) + def test_exception_class(self): + f = asyncio.Future(loop=self.loop) + f.set_exception(RuntimeError) + self.assertIsInstance(f.exception(), RuntimeError) + def test_yield_from_twice(self): f = asyncio.Future(loop=self.loop) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #20444: Reduced code duplication. Thanks to dongwm for the report and
by vinay.sajip Jan. 30, 2014

Jan. 30, 2014

http://hg.python.org/cpython/rev/03b399c807d6 changeset: 88838:03b399c807d6 branch: 2.7 parent: 88817:09716a4d6c52 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Thu Jan 30 20:22:01 2014 +0000 summary: Issue #20444: Reduced code duplication. Thanks to dongwm for the report and patch. files: Lib/logging/config.py | 88 ++++++++++++------------------ 1 files changed, 36 insertions(+), 52 deletions(-) diff --git a/Lib/logging/config.py b/Lib/logging/config.py --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -1,4 +1,4 @@ -# Copyright 2001-2013 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2014 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -19,7 +19,7 @@ is based on PEP 282 and comments thereto in comp.lang.python, and influenced by Apache's log4j system. -Copyright (C) 2001-2013 Vinay Sajip. All Rights Reserved. +Copyright (C) 2001-2014 Vinay Sajip. All Rights Reserved. To use, simply 'import logging' and log away! """ @@ -275,6 +275,30 @@ return True +class ConvertingMixin(object): + """For ConvertingXXX's, this mixin class provides common functions""" + + def convert_with_key(self, key, value, replace=True): + result = self.configurator.convert(value) + #If the converted value is different, save for next time + if value is not result: + if replace: + self[key] = result + if type(result) in (ConvertingDict, ConvertingList, + ConvertingTuple): + result.parent = self + result.key = key + return result + + def convert(self, value): + result = self.configurator.convert(value) + if value is not result: + if type(result) in (ConvertingDict, ConvertingList, + ConvertingTuple): + result.parent = self + return result + + # The ConvertingXXX classes are wrappers around standard Python containers, # and they serve to convert any suitable values in the container. The # conversion converts base dicts, lists and tuples to their wrapped @@ -284,77 +308,37 @@ # Each wrapper should have a configurator attribute holding the actual # configurator to use for conversion. -class ConvertingDict(dict): +class ConvertingDict(dict, ConvertingMixin): """A converting dictionary wrapper.""" def __getitem__(self, key): value = dict.__getitem__(self, key) - result = self.configurator.convert(value) - #If the converted value is different, save for next time - if value is not result: - self[key] = result - if type(result) in (ConvertingDict, ConvertingList, - ConvertingTuple): - result.parent = self - result.key = key - return result + return self.convert_with_key(key, value) def get(self, key, default=None): value = dict.get(self, key, default) - result = self.configurator.convert(value) - #If the converted value is different, save for next time - if value is not result: - self[key] = result - if type(result) in (ConvertingDict, ConvertingList, - ConvertingTuple): - result.parent = self - result.key = key - return result + return self.convert_with_key(key, value) def pop(self, key, default=None): value = dict.pop(self, key, default) - result = self.configurator.convert(value) - if value is not result: - if type(result) in (ConvertingDict, ConvertingList, - ConvertingTuple): - result.parent = self - result.key = key - return result + return self.convert_with_key(key, value, replace=False) -class ConvertingList(list): +class ConvertingList(list, ConvertingMixin): """A converting list wrapper.""" def __getitem__(self, key): value = list.__getitem__(self, key) - result = self.configurator.convert(value) - #If the converted value is different, save for next time - if value is not result: - self[key] = result - if type(result) in (ConvertingDict, ConvertingList, - ConvertingTuple): - result.parent = self - result.key = key - return result + return self.convert_with_key(key, value) def pop(self, idx=-1): value = list.pop(self, idx) - result = self.configurator.convert(value) - if value is not result: - if type(result) in (ConvertingDict, ConvertingList, - ConvertingTuple): - result.parent = self - return result + return self.convert(value) -class ConvertingTuple(tuple): +class ConvertingTuple(tuple, ConvertingMixin): """A converting tuple wrapper.""" def __getitem__(self, key): value = tuple.__getitem__(self, key) - result = self.configurator.convert(value) - if value is not result: - if type(result) in (ConvertingDict, ConvertingList, - ConvertingTuple): - result.parent = self - result.key = key - return result + # Can't replace a tuple entry. + return self.convert_with_key(key, value, replace=False) class BaseConfigurator(object): """ -- Repository URL: http://hg.python.org/cpython

1 0

cpython: overlapped.c: Fix usage of the union
by victor.stinner Jan. 30, 2014

Jan. 30, 2014

http://hg.python.org/cpython/rev/73dbb884eb09 changeset: 88837:73dbb884eb09 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Jan 30 19:06:44 2014 +0100 summary: overlapped.c: Fix usage of the union * read_buffer can only be used for TYPE_READ and TYPE_ACCEPT types * write_buffer can only be used for TYPE_WRITE type files: Modules/overlapped.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Modules/overlapped.c b/Modules/overlapped.c --- a/Modules/overlapped.c +++ b/Modules/overlapped.c @@ -45,9 +45,9 @@ /* Type of operation */ DWORD type; union { - /* Buffer used for reading (optional) */ + /* Buffer used for reading: TYPE_READ and TYPE_ACCEPT */ PyObject *read_buffer; - /* Buffer used for writing (optional) */ + /* Buffer used for writing: TYPE_WRITE */ Py_buffer write_buffer; }; } OverlappedObject; @@ -568,13 +568,15 @@ if (self->overlapped.hEvent != NULL) CloseHandle(self->overlapped.hEvent); - if (self->write_buffer.obj) - PyBuffer_Release(&self->write_buffer); - switch (self->type) { - case TYPE_READ: - case TYPE_ACCEPT: - Py_CLEAR(self->read_buffer); + case TYPE_READ: + case TYPE_ACCEPT: + Py_CLEAR(self->read_buffer); + break; + case TYPE_WRITE: + if (self->write_buffer.obj) + PyBuffer_Release(&self->write_buffer); + break; } PyObject_Del(self); SetLastError(olderr); @@ -648,7 +650,7 @@ case ERROR_MORE_DATA: break; case ERROR_BROKEN_PIPE: - if (self->read_buffer != NULL) + if ((self->type == TYPE_READ || self->type == TYPE_ACCEPT) && self->read_buffer != NULL) break; /* fall through */ default: -- Repository URL: http://hg.python.org/cpython

1 0

devguide: Issue #20448: Escape backslashes. Caught by Saimadhav Heblikar.
by zach.ware Jan. 30, 2014

Jan. 30, 2014

http://hg.python.org/devguide/rev/7d95a62513ce changeset: 663:7d95a62513ce user: Zachary Ware <zachary.ware(a)gmail.com> date: Thu Jan 30 10:23:24 2014 -0600 summary: Issue #20448: Escape backslashes. Caught by Saimadhav Heblikar. files: setup.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.rst b/setup.rst --- a/setup.rst +++ b/setup.rst @@ -221,8 +221,8 @@ to build. If you prefer, you can exclude the offending projects from the build process by unchecking them inside the :menuselection:`Build --> Configuration Manager...` settings. You can -also use the script :file:`Tools\\buildbot\external.bat` or -:file:`Tools\\buildbot\external-amd64.bat` (as applicable) to download and +also use the script :file:`Tools\\buildbot\\external.bat` or +:file:`Tools\\buildbot\\external-amd64.bat` (as applicable) to download and compile missing dependencies. Once built you might want to set Python as a startup project. Pressing F5 in -- Repository URL: http://hg.python.org/devguide

1 0

peps: Wording tweaks
by nick.coghlan Jan. 30, 2014

Jan. 30, 2014

http://hg.python.org/peps/rev/4ad34ebe2a06 changeset: 5368:4ad34ebe2a06 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Thu Jan 30 22:18:50 2014 +1000 summary: Wording tweaks files: pep-0427.txt | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pep-0427.txt b/pep-0427.txt --- a/pep-0427.txt +++ b/pep-0427.txt @@ -400,17 +400,18 @@ Is it possible to import Python code directly from a wheel file? ---------------------------------------------------------------- - Technically, a subset of wheel files *do* support being placed directly - on ``sys.path`` (due to the combination of supporting installation - via simple extraction and using an archive format that is compatible - with ``zipimport``), but actually doing so is generally discouraged. + Technically, due to the combination of supporting installation via + simple extraction and using an archive format that is compatible with + ``zipimport``, a subset of wheel files *do* support being placed directly + on ``sys.path``. However, while this behaviour is a natural consequence + of the format design, actually relying on it is generally discouraged. - Firstly, wheel *is* designed primarily as an installation format, so - skipping the installation step means deliberately avoiding any reliance - on features that assume full installation (such as being able to use - standard tools like ``pip`` and ``virtualenv`` to capture and manage - dependencies in a way that can be properly tracked for auditing and - security update purposes, or integrating fully with the standard + Firstly, wheel *is* designed primarily as a distribution format, so + skipping the installation step also means deliberately avoiding any + reliance on features that assume full installation (such as being able + to use standard tools like ``pip`` and ``virtualenv`` to capture and + manage dependencies in a way that can be properly tracked for auditing + and security update purposes, or integrating fully with the standard build machinery for C extensions by publishing header files in the appropriate place). @@ -426,10 +427,10 @@ a zip archive the ``__file__`` attribute no longer refers to an ordinary filesystem path, but to a combination path that includes both the location of the zip archive on the filesystem and the - relative path to the module inside the archive). Even when software - uses the abstract resource APIs correctly internally, interfacing with - external components may still require the available of an actual on-disk - file. + relative path to the module inside the archive. Even when software + correctly uses the abstract resource APIs internally, interfacing with + external components may still require the availability of an actual + on-disk file. Like metaclasses, monkeypatching and metapath importers, if you're not already sure you need to take advantage of this feature, you almost -- Repository URL: http://hg.python.org/peps

1 0

peps: PEP 427: emphasise the preference for installation
by nick.coghlan Jan. 30, 2014

Jan. 30, 2014

http://hg.python.org/peps/rev/26983acc9c11 changeset: 5367:26983acc9c11 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Thu Jan 30 22:07:45 2014 +1000 summary: PEP 427: emphasise the preference for installation The zipimport compatibility isn't an accident, but relying on it is still a great way to create obscure bugs for yourself if you don't already know exactly what you're doing. files: pep-0427.txt | 49 +++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 15 deletions(-) diff --git a/pep-0427.txt b/pep-0427.txt --- a/pep-0427.txt +++ b/pep-0427.txt @@ -400,23 +400,42 @@ Is it possible to import Python code directly from a wheel file? ---------------------------------------------------------------- - Yes, the wheel format is deliberately designed to be compatible with - Python's support for importing from zip files, ensuring that it - provides a superset of the functionality provided by the preceding - egg format. + Technically, a subset of wheel files *do* support being placed directly + on ``sys.path`` (due to the combination of supporting installation + via simple extraction and using an archive format that is compatible + with ``zipimport``), but actually doing so is generally discouraged. - However, this is generally not a *recommended* approach to using wheel - files, as importing from a zip file rather than an ordinary filesystem - directory imposes a number of additional constraints that will often - break the assumptions of Python developers (for example, C extensions - cannot be imported directly from a zip archive, and the ``__file__`` - attribute no longer refers to an ordinary filesystem path, but to - a combination path that includes both the location of the zip archive - on the filesystem and the relative path to the module inside the - archive). + Firstly, wheel *is* designed primarily as an installation format, so + skipping the installation step means deliberately avoiding any reliance + on features that assume full installation (such as being able to use + standard tools like ``pip`` and ``virtualenv`` to capture and manage + dependencies in a way that can be properly tracked for auditing and + security update purposes, or integrating fully with the standard + build machinery for C extensions by publishing header files in the + appropriate place). - Like metaclasses and metapath importers, if you're not sure if you need - to take advantage of this feature, you almost certainly don't need it. + Secondly, while some Python software is written to support running + directly from a zip archive, it is still common for code to be written + assuming it has been fully installed. When that assumption is broken + by trying to run the software from a zip archive, the failures can often + be obscure and hard to diagnose (especially when they occur in third + party libraries). The two most common sources of problems with this + are the fact that importing C extensions from a zip archive is *not* + supported by CPython (since doing so is not supported directly by the + dynamic loading machinery on any platform) and that when running from + a zip archive the ``__file__`` attribute no longer refers to an + ordinary filesystem path, but to a combination path that includes + both the location of the zip archive on the filesystem and the + relative path to the module inside the archive). Even when software + uses the abstract resource APIs correctly internally, interfacing with + external components may still require the available of an actual on-disk + file. + + Like metaclasses, monkeypatching and metapath importers, if you're not + already sure you need to take advantage of this feature, you almost + certainly don't need it. If you *do* decide to use it anyway, be + aware that many projects will require a failure to be reproduced with + a fully installed package before accepting it as a genuine bug. References -- Repository URL: http://hg.python.org/peps

1 0

Daily reference leaks (d5ad8bd335f5): sum=-4
by solipsis＠pitrou.net Jan. 30, 2014

Jan. 30, 2014

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

1 0

cpython (merge 3.3 -> default): Remove issue 19081 Misc/NEWS entry since it isn't entirely fixed yet.
by gregory.p.smith Jan. 30, 2014

Jan. 30, 2014

http://hg.python.org/cpython/rev/03fc7449f204 changeset: 88836:03fc7449f204 parent: 88834:3ee3d4449a9f parent: 88835:ecb272bae417 user: Gregory P. Smith <greg(a)krypto.org> date: Wed Jan 29 23:02:49 2014 -0800 summary: Remove issue 19081 Misc/NEWS entry since it isn't entirely fixed yet. files: Misc/NEWS | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -105,11 +105,6 @@ source encoding declarations, and can be used to make Python batch files on Windows. -- Issue #19081: When a zipimport .zip file in sys.path being imported from - is modified during the lifetime of the Python process after zipimport has - already cached the zip's table of contents we detect this and recover - rather than read bad data from the .zip (causing odd import errors). - Library ------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Remove issue 19081 Misc/NEWS entry since it isn't entirely fixed yet.
by gregory.p.smith Jan. 30, 2014

Jan. 30, 2014

http://hg.python.org/cpython/rev/ecb272bae417 changeset: 88835:ecb272bae417 branch: 3.3 parent: 88833:885c709d0dde user: Gregory P. Smith <greg(a)krypto.org> date: Wed Jan 29 22:59:34 2014 -0800 summary: Remove issue 19081 Misc/NEWS entry since it isn't entirely fixed yet. files: Misc/NEWS | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,11 +24,6 @@ source encoding declarations, and can be used to make Python batch files on Windows. -- Issue #19081: When a zipimport .zip file in sys.path being imported from - is modified during the lifetime of the Python process after zipimport has - already cached the zip's table of contents we detect this and recover - rather than read bad data from the .zip (causing odd import errors). - - Issue #17432: Drop UCS2 from names of Unicode functions in python3.def. - Issue #19969: PyBytes_FromFormatV() now raises an OverflowError if "%c" -- Repository URL: http://hg.python.org/cpython

1 0

cpython: inspect.doc: Soften the note about inspect.signature not supporting
by yury.selivanov Jan. 30, 2014

Jan. 30, 2014

http://hg.python.org/cpython/rev/3ee3d4449a9f changeset: 88834:3ee3d4449a9f parent: 88832:0a3201aab2b8 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Thu Jan 30 00:22:57 2014 -0500 summary: inspect.doc: Soften the note about inspect.signature not supporting all builtin functions. files: Doc/library/inspect.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -440,8 +440,8 @@ .. note:: Some callables may not be introspectable in certain implementations of - Python. For example, in CPython, built-in functions defined in C provide - no metadata about their arguments. + Python. For example, in CPython, some built-in functions defined in + C provide no metadata about their arguments. .. class:: Signature(parameters=None, \*, return_annotation=Signature.empty) -- Repository URL: http://hg.python.org/cpython

1 0