Mailman 3 March 2013 - Python-checkins

cpython: Issue #17581: try to fix building on old OpenSSL versions
by antoine.pitrou March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/02f9335b7efb changeset: 83021:02f9335b7efb parent: 83006:ae5c4a9118b8 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Mar 30 16:29:32 2013 +0100 summary: Issue #17581: try to fix building on old OpenSSL versions files: Modules/_ssl.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -95,6 +95,15 @@ # define HAVE_TLSv1_2 0 #endif +/* SNI support (client- and server-side) appeared in OpenSSL 0.9.8n. + * This includes the SSL_set_SSL_CTX() function. + */ +#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME +# define HAVE_SNI 1 +#else +# define HAVE_SNI 0 +#endif + enum py_ssl_error { /* these mirror ssl.h */ PY_SSL_ERROR_NONE, @@ -485,7 +494,7 @@ SSL_set_mode(self->ssl, SSL_MODE_AUTO_RETRY); #endif -#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME +#if HAVE_SNI if (server_hostname != NULL) SSL_set_tlsext_host_name(self->ssl, server_hostname); #endif @@ -1195,11 +1204,16 @@ void *closure) { if (PyObject_TypeCheck(value, &PySSLContext_Type)) { - +#if !HAVE_SNI + PyErr_SetString(PyExc_NotImplementedError, "setting a socket's " + "context is not supported by your OpenSSL library"); + return NULL; +#else Py_INCREF(value); Py_DECREF(self->ctx); self->ctx = (PySSLContext *) value; SSL_set_SSL_CTX(self->ssl, self->ctx->ctx); +#endif } else { PyErr_SetString(PyExc_TypeError, "The value must be a SSLContext"); return -1; @@ -2307,7 +2321,7 @@ &sock, &server_side, "idna", &hostname)) return NULL; -#ifndef SSL_CTRL_SET_TLSEXT_HOSTNAME +#if !HAVE_SNI PyMem_Free(hostname); PyErr_SetString(PyExc_ValueError, "server_hostname is not supported " "by your OpenSSL library"); @@ -2400,7 +2414,7 @@ } #endif -#ifndef OPENSSL_NO_TLSEXT +#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT) static int _servername_callback(SSL *s, int *al, void *args) { @@ -2500,7 +2514,7 @@ static PyObject * set_servername_callback(PySSLContext *self, PyObject *args) { -#ifndef OPENSSL_NO_TLSEXT +#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT) PyObject *cb; if (!PyArg_ParseTuple(args, "O", &cb)) @@ -2997,10 +3011,16 @@ ADD_AD_CONSTANT(INTERNAL_ERROR); ADD_AD_CONSTANT(USER_CANCELLED); ADD_AD_CONSTANT(NO_RENEGOTIATION); + /* Not all constants are in old OpenSSL versions */ +#ifdef SSL_AD_UNSUPPORTED_EXTENSION ADD_AD_CONSTANT(UNSUPPORTED_EXTENSION); +#endif +#ifdef SSL_AD_CERTIFICATE_UNOBTAINABLE ADD_AD_CONSTANT(CERTIFICATE_UNOBTAINABLE); +#endif +#ifdef SSL_AD_UNRECOGNIZED_NAME ADD_AD_CONSTANT(UNRECOGNIZED_NAME); - /* Not all constants are in old OpenSSL versions */ +#endif #ifdef SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE ADD_AD_CONSTANT(BAD_CERTIFICATE_STATUS_RESPONSE); #endif @@ -3052,7 +3072,7 @@ SSL_OP_NO_COMPRESSION); #endif -#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME +#if HAVE_SNI r = Py_True; #else r = Py_False; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): merge 2.7.4 release branch
by benjamin.peterson March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/bf5ff2a58096 changeset: 83020:bf5ff2a58096 branch: 2.7 parent: 83012:b9de69c715fc parent: 83019:de48977f9289 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Mar 30 10:37:25 2013 -0400 summary: merge 2.7.4 release branch files: Lib/test/pickletester.py | 10 ++++++++-- Misc/NEWS | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -6,8 +6,14 @@ import pickletools import copy_reg -from test.test_support import (TestFailed, have_unicode, TESTFN, _2G, _1M, - precisionbigmemtest) +from test.test_support import TestFailed, verbose, have_unicode, TESTFN +try: + from test.test_support import _2G, _1M, precisionbigmemtest +except ImportError: + # this import might fail when run on older Python versions by test_xpickle + _2G = _1G = 0 + def precisionbigmemtest(*args, **kwargs): + return lambda self: None # Tests that try a number of pickle protocols should have a # for proto in protocols: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -39,6 +39,8 @@ - Issue #17531: Fix tests that thought group and user ids were always the int type. Also, always allow -1 as a valid group and user id. +- Issue #17533: Fix test_xpickle with older versions of Python 2.5. + Documentation ------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): fall back when an old test_support doesn't have various data and functions
by benjamin.peterson March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/de48977f9289 changeset: 83019:de48977f9289 branch: 2.7 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Mar 30 10:36:31 2013 -0400 summary: fall back when an old test_support doesn't have various data and functions (closes #17533) files: Lib/test/pickletester.py | 10 ++++++++-- Misc/NEWS | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -6,8 +6,14 @@ import pickletools import copy_reg -from test.test_support import (TestFailed, have_unicode, TESTFN, _2G, _1M, - precisionbigmemtest) +from test.test_support import TestFailed, verbose, have_unicode, TESTFN +try: + from test.test_support import _2G, _1M, precisionbigmemtest +except ImportError: + # this import might fail when run on older Python versions by test_xpickle + _2G = _1G = 0 + def precisionbigmemtest(*args, **kwargs): + return lambda self: None # Tests that try a number of pickle protocols should have a # for proto in protocols: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,6 +24,8 @@ - Issue #17531: Fix tests that thought group and user ids were always the int type. Also, always allow -1 as a valid group and user id. +- Issue #17533: Fix test_xpickle with older versions of Python 2.5. + Documentation ------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix typos and clear up one very odd bit of wording as pointed out by
by benjamin.peterson March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/7b6bff37259e changeset: 83018:7b6bff37259e branch: 2.7 user: Gregory P. Smith <greg(a)krypto.org> date: Sat Mar 30 01:38:38 2013 -0700 summary: Fix typos and clear up one very odd bit of wording as pointed out by Ezio. files: Doc/library/xml.rst | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -108,20 +108,22 @@ defused packages ---------------- +These external packages are recommended for any code that parses +untrusted XML data. + `defusedxml`_ is a pure Python package with modified subclasses of all stdlib -XML parsers that prevent any potentially malicious operation. The courses of -action are recommended for any server code that parses untrusted XML data. The -package also ships with example exploits and an extended documentation on more +XML parsers that prevent any potentially malicious operation. The +package also ships with example exploits and extended documentation on more XML exploits like xpath injection. -`defusedexpat`_ provides a modified libexpat and patched replacment +`defusedexpat`_ provides a modified libexpat and patched replacement :mod:`pyexpat` extension module with countermeasures against entity expansion DoS attacks. Defusedexpat still allows a sane and configurable amount of entity expansions. The modifications will be merged into future releases of Python. The workarounds and modifications are not included in patch releases as they break backward compatibility. After all inline DTD and entity expansion are -well-definied XML features. +well-defined XML features. .. _defusedxml: https://pypi.python.org/pypi/defusedxml/ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix XML vulnerability link targets.
by benjamin.peterson March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/d73d9dbba4d9 changeset: 83017:d73d9dbba4d9 branch: 2.7 user: Christian Heimes <christian(a)cheimes.de> date: Thu Mar 28 11:42:49 2013 +0100 summary: Fix XML vulnerability link targets. files: Doc/library/xml.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -124,8 +124,8 @@ well-definied XML features. -.. _defusedxml: <https://pypi.python.org/pypi/defusedxml/> -.. _defusedexpat: <https://pypi.python.org/pypi/defusedexpat/> +.. _defusedxml: https://pypi.python.org/pypi/defusedxml/ +.. _defusedexpat: https://pypi.python.org/pypi/defusedexpat/ .. _Billion Laughs: http://en.wikipedia.org/wiki/Billion_laughs .. _ZIP bomb: http://en.wikipedia.org/wiki/Zip_bomb .. _DTD: http://en.wikipedia.org/wiki/Document_Type_Definition -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue 17538: Document XML vulnerabilties
by benjamin.peterson March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/91bb6d7ae833 changeset: 83016:91bb6d7ae833 branch: 2.7 user: Christian Heimes <christian(a)cheimes.de> date: Tue Mar 26 17:53:05 2013 +0100 summary: Issue 17538: Document XML vulnerabilties files: Doc/library/markup.rst | 1 + Doc/library/pyexpat.rst | 8 + Doc/library/xml.dom.minidom.rst | 8 + Doc/library/xml.dom.pulldom.rst | 7 + Doc/library/xml.etree.elementtree.rst | 8 + Doc/library/xml.rst | 131 ++++++++++++++ Doc/library/xml.sax.rst | 8 + Doc/library/xmlrpclib.rst | 7 + Misc/NEWS | 5 + 9 files changed, 183 insertions(+), 0 deletions(-) diff --git a/Doc/library/markup.rst b/Doc/library/markup.rst --- a/Doc/library/markup.rst +++ b/Doc/library/markup.rst @@ -25,6 +25,7 @@ htmlparser.rst sgmllib.rst htmllib.rst + xml.rst xml.etree.elementtree.rst xml.dom.rst xml.dom.minidom.rst diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst --- a/Doc/library/pyexpat.rst +++ b/Doc/library/pyexpat.rst @@ -14,6 +14,14 @@ directive. Since they are attributes which are set by client code, in-text references to these attributes should be marked using the :member: role. + +.. warning:: + + The :mod:`pyexpat` module is not secure against maliciously + constructed data. If you need to parse untrusted or unauthenticated data see + :ref:`xml-vulnerabilities`. + + .. versionadded:: 2.0 .. index:: single: Expat diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst --- a/Doc/library/xml.dom.minidom.rst +++ b/Doc/library/xml.dom.minidom.rst @@ -20,6 +20,14 @@ not already proficient with the DOM should consider using the :mod:`xml.etree.ElementTree` module for their XML processing instead + +.. warning:: + + The :mod:`xml.dom.minidom` module is not secure against + maliciously constructed data. If you need to parse untrusted or + unauthenticated data see :ref:`xml-vulnerabilities`. + + DOM applications typically start by parsing some XML into a DOM. With :mod:`xml.dom.minidom`, this is done through the parse functions:: diff --git a/Doc/library/xml.dom.pulldom.rst b/Doc/library/xml.dom.pulldom.rst --- a/Doc/library/xml.dom.pulldom.rst +++ b/Doc/library/xml.dom.pulldom.rst @@ -16,6 +16,13 @@ Object Model representation of a document from SAX events. +.. warning:: + + The :mod:`xml.dom.pulldom` module is not secure against + maliciously constructed data. If you need to parse untrusted or + unauthenticated data see :ref:`xml-vulnerabilities`. + + .. class:: PullDOM([documentFactory]) :class:`xml.sax.handler.ContentHandler` implementation that ... diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -16,6 +16,14 @@ hierarchical data structures in memory. The type can be described as a cross between a list and a dictionary. + +.. warning:: + + The :mod:`xml.etree.ElementTree` module is not secure against + maliciously constructed data. If you need to parse untrusted or + unauthenticated data see :ref:`xml-vulnerabilities`. + + Each element has a number of properties associated with it: * a tag which is a string identifying what kind of data this element represents diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst new file mode 100644 --- /dev/null +++ b/Doc/library/xml.rst @@ -0,0 +1,131 @@ +.. _xml: + +XML Processing Modules +====================== + +.. module:: xml + :synopsis: Package containing XML processing modules +.. sectionauthor:: Christian Heimes <christian(a)python.org> +.. sectionauthor:: Georg Brandl <georg(a)python.org> + + +Python's interfaces for processing XML are grouped in the ``xml`` package. + +.. warning:: + + The XML modules are not secure against erroneous or maliciously + constructed data. If you need to parse untrusted or unauthenticated data see + :ref:`xml-vulnerabilities`. + +It is important to note that modules in the :mod:`xml` package require that +there be at least one SAX-compliant XML parser available. The Expat parser is +included with Python, so the :mod:`xml.parsers.expat` module will always be +available. + +The documentation for the :mod:`xml.dom` and :mod:`xml.sax` packages are the +definition of the Python bindings for the DOM and SAX interfaces. + +The XML handling submodules are: + +* :mod:`xml.etree.ElementTree`: the ElementTree API, a simple and lightweight + +.. + +* :mod:`xml.dom`: the DOM API definition +* :mod:`xml.dom.minidom`: a lightweight DOM implementation +* :mod:`xml.dom.pulldom`: support for building partial DOM trees + +.. + +* :mod:`xml.sax`: SAX2 base classes and convenience functions +* :mod:`xml.parsers.expat`: the Expat parser binding + + +.. _xml-vulnerabilities: + +XML vulnerabilities +=================== + +The XML processing modules are not secure against maliciously constructed data. +An attacker can abuse vulnerabilities for e.g. denial of service attacks, to +access local files, to generate network connections to other machines, or +to or circumvent firewalls. The attacks on XML abuse unfamiliar features +like inline `DTD`_ (document type definition) with entities. + + +========================= ======== ========= ========= ======== ========= +kind sax etree minidom pulldom xmlrpc +========================= ======== ========= ========= ======== ========= +billion laughs **True** **True** **True** **True** **True** +quadratic blowup **True** **True** **True** **True** **True** +external entity expansion **True** False (1) False (2) **True** False (3) +DTD retrieval **True** False False **True** False +decompression bomb False False False False **True** +========================= ======== ========= ========= ======== ========= + +1. :mod:`xml.etree.ElementTree` doesn't expand external entities and raises a + ParserError when an entity occurs. +2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns + the unexpanded entity verbatim. +3. :mod:`xmlrpclib` doesn't expand external entities and omits them. + + +billion laughs / exponential entity expansion + The `Billion Laughs`_ attack -- also known as exponential entity expansion -- + uses multiple levels of nested entities. Each entity refers to another entity + several times, the final entity definition contains a small string. Eventually + the small string is expanded to several gigabytes. The exponential expansion + consumes lots of CPU time, too. + +quadratic blowup entity expansion + A quadratic blowup attack is similar to a `Billion Laughs`_ attack; it abuses + entity expansion, too. Instead of nested entities it repeats one large entity + with a couple of thousand chars over and over again. The attack isn't as + efficient as the exponential case but it avoids triggering countermeasures of + parsers against heavily nested entities. + +external entity expansion + Entity declarations can contain more than just text for replacement. They can + also point to external resources by public identifiers or system identifiers. + System identifiers are standard URIs or can refer to local files. The XML + parser retrieves the resource with e.g. HTTP or FTP requests and embeds the + content into the XML document. + +DTD retrieval + Some XML libraries like Python's mod:'xml.dom.pulldom' retrieve document type + definitions from remote or local locations. The feature has similar + implications as the external entity expansion issue. + +decompression bomb + The issue of decompression bombs (aka `ZIP bomb`_) apply to all XML libraries + that can parse compressed XML stream like gzipped HTTP streams or LZMA-ed + files. For an attacker it can reduce the amount of transmitted data by three + magnitudes or more. + +The documentation of `defusedxml`_ on PyPI has further information about +all known attack vectors with examples and references. + +defused packages +---------------- + +`defusedxml`_ is a pure Python package with modified subclasses of all stdlib +XML parsers that prevent any potentially malicious operation. The courses of +action are recommended for any server code that parses untrusted XML data. The +package also ships with example exploits and an extended documentation on more +XML exploits like xpath injection. + +`defusedexpat`_ provides a modified libexpat and patched replacment +:mod:`pyexpat` extension module with countermeasures against entity expansion +DoS attacks. Defusedexpat still allows a sane and configurable amount of entity +expansions. The modifications will be merged into future releases of Python. + +The workarounds and modifications are not included in patch releases as they +break backward compatibility. After all inline DTD and entity expansion are +well-definied XML features. + + +.. _defusedxml: <https://pypi.python.org/pypi/defusedxml/> +.. _defusedexpat: <https://pypi.python.org/pypi/defusedexpat/> +.. _Billion Laughs: http://en.wikipedia.org/wiki/Billion_laughs +.. _ZIP bomb: http://en.wikipedia.org/wiki/Zip_bomb +.. _DTD: http://en.wikipedia.org/wiki/Document_Type_Definition diff --git a/Doc/library/xml.sax.rst b/Doc/library/xml.sax.rst --- a/Doc/library/xml.sax.rst +++ b/Doc/library/xml.sax.rst @@ -16,6 +16,14 @@ SAX exceptions and the convenience functions which will be most used by users of the SAX API. + +.. warning:: + + The :mod:`xml.sax` module is not secure against maliciously + constructed data. If you need to parse untrusted or unauthenticated data see + :ref:`xml-vulnerabilities`. + + The convenience functions are: diff --git a/Doc/library/xmlrpclib.rst b/Doc/library/xmlrpclib.rst --- a/Doc/library/xmlrpclib.rst +++ b/Doc/library/xmlrpclib.rst @@ -28,6 +28,13 @@ between conformable Python objects and XML on the wire. +.. warning:: + + The :mod:`xmlrpclib` module is not secure against maliciously + constructed data. If you need to parse untrusted or unauthenticated data see + :ref:`xml-vulnerabilities`. + + .. class:: ServerProxy(uri[, transport[, encoding[, verbose[, allow_none[, use_datetime]]]]]) A :class:`ServerProxy` instance is an object that manages communication with a diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,6 +24,11 @@ - Issue #17531: Fix tests that thought group and user ids were always the int type. Also, always allow -1 as a valid group and user id. +Documentation +------------- + +- Issue 17538: Document XML vulnerabilties + What's New in Python 2.7.4 release candidate 1 ============================================== -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Update collections ABC table to match the __abstractmethods__ attribute for
by benjamin.peterson March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/db3c5132877c changeset: 83015:db3c5132877c branch: 2.7 parent: 82962:27cb49ede303 user: Raymond Hettinger <python(a)rcn.com> date: Sat Mar 23 08:57:00 2013 -0700 summary: Update collections ABC table to match the __abstractmethods__ attribute for each container. files: Doc/library/collections.rst | 40 ++++++++++++++---------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -895,29 +895,35 @@ :class:`Sized` ``__len__`` :class:`Callable` ``__call__`` -:class:`Sequence` :class:`Sized`, ``__getitem__`` ``__contains__``, ``__iter__``, ``__reversed__``, - :class:`Iterable`, ``index``, and ``count`` +:class:`Sequence` :class:`Sized`, ``__getitem__``, ``__contains__``, ``__iter__``, ``__reversed__``, + :class:`Iterable`, ``__len__`` ``index``, and ``count`` :class:`Container` -:class:`MutableSequence` :class:`Sequence` ``__setitem__``, Inherited :class:`Sequence` methods and - ``__delitem__``, ``append``, ``reverse``, ``extend``, ``pop``, - ``insert`` ``remove``, and ``__iadd__`` +:class:`MutableSequence` :class:`Sequence` ``__getitem__``, Inherited :class:`Sequence` methods and + ``__setitem__``, ``append``, ``reverse``, ``extend``, ``pop``, + ``__delitem__``, ``remove``, and ``__iadd__`` + ``__len__``, + ``insert`` -:class:`Set` :class:`Sized`, ``__le__``, ``__lt__``, ``__eq__``, ``__ne__``, - :class:`Iterable`, ``__gt__``, ``__ge__``, ``__and__``, ``__or__``, - :class:`Container` ``__sub__``, ``__xor__``, and ``isdisjoint`` +:class:`Set` :class:`Sized`, ``__contains__``, ``__le__``, ``__lt__``, ``__eq__``, ``__ne__``, + :class:`Iterable`, ``__iter__``, ``__gt__``, ``__ge__``, ``__and__``, ``__or__``, + :class:`Container` ``__len__`` ``__sub__``, ``__xor__``, and ``isdisjoint`` -:class:`MutableSet` :class:`Set` ``add``, Inherited :class:`Set` methods and - ``discard`` ``clear``, ``pop``, ``remove``, ``__ior__``, - ``__iand__``, ``__ixor__``, and ``__isub__`` +:class:`MutableSet` :class:`Set` ``__contains__``, Inherited :class:`Set` methods and + ``__iter__``, ``clear``, ``pop``, ``remove``, ``__ior__``, + ``__len__``, ``__iand__``, ``__ixor__``, and ``__isub__`` + ``add``, + ``discard`` -:class:`Mapping` :class:`Sized`, ``__getitem__`` ``__contains__``, ``keys``, ``items``, ``values``, - :class:`Iterable`, ``get``, ``__eq__``, and ``__ne__`` - :class:`Container` +:class:`Mapping` :class:`Sized`, ``__getitem__``, ``__contains__``, ``keys``, ``items``, ``values``, + :class:`Iterable`, ``__iter__``, ``get``, ``__eq__``, and ``__ne__`` + :class:`Container` ``__len__`` -:class:`MutableMapping` :class:`Mapping` ``__setitem__``, Inherited :class:`Mapping` methods and - ``__delitem__`` ``pop``, ``popitem``, ``clear``, ``update``, - and ``setdefault`` +:class:`MutableMapping` :class:`Mapping` ``__getitem__``, Inherited :class:`Mapping` methods and + ``__setitem__``, ``pop``, ``popitem``, ``clear``, ``update``, + ``__delitem__``, and ``setdefault`` + ``__iter__``, + ``__len__`` :class:`MappingView` :class:`Sized` ``__len__`` -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Merged documentation update from 3.3.
by vinay.sajip March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/efb44458afcd changeset: 83014:efb44458afcd parent: 83011:d5d6209745ab parent: 83013:7fd5d9fe9f71 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Mar 30 11:57:09 2013 +0000 summary: Merged documentation update from 3.3. files: Doc/howto/logging-cookbook.rst | 34 ++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -1094,6 +1094,40 @@ string. That's because the __ notation is just syntax sugar for a constructor call to one of the XXXMessage classes. +If you prefer, you can use a :class:`LoggerAdapter` to achieve a similar effect +to the above, as in the following example:: + + import logging + + class Message(object): + def __init__(self, fmt, args): + self.fmt = fmt + self.args = args + + def __str__(self): + return self.fmt.format(*self.args) + + class StyleAdapter(logging.LoggerAdapter): + def __init__(self, logger, extra=None): + super(StyleAdapter, self).__init__(logger, extra or {}) + + def log(self, level, msg, *args, **kwargs): + if self.isEnabledFor(level): + msg, kwargs = self.process(msg, kwargs) + self.logger._log(level, Message(msg, args), (), **kwargs) + + logger = StyleAdapter(logging.getLogger(__name__)) + + def main(): + logger.debug('Hello, {}', 'world!') + + if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG) + main() + +The above script should log the message ``Hello, world!`` when run with +Python 3.2 or later. + .. currentmodule:: logging -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Updated logging cookbook with additional example for output using str.format().
by vinay.sajip March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/7fd5d9fe9f71 changeset: 83013:7fd5d9fe9f71 branch: 3.3 parent: 83010:b0c0a03b8033 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Mar 30 11:56:18 2013 +0000 summary: Updated logging cookbook with additional example for output using str.format(). files: Doc/howto/logging-cookbook.rst | 34 ++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -1096,6 +1096,40 @@ string. That's because the __ notation is just syntax sugar for a constructor call to one of the XXXMessage classes. +If you prefer, you can use a :class:`LoggerAdapter` to achieve a similar effect +to the above, as in the following example:: + + import logging + + class Message(object): + def __init__(self, fmt, args): + self.fmt = fmt + self.args = args + + def __str__(self): + return self.fmt.format(*self.args) + + class StyleAdapter(logging.LoggerAdapter): + def __init__(self, logger, extra=None): + super(StyleAdapter, self).__init__(logger, extra or {}) + + def log(self, level, msg, *args, **kwargs): + if self.isEnabledFor(level): + msg, kwargs = self.process(msg, kwargs) + self.logger._log(level, Message(msg, args), (), **kwargs) + + logger = StyleAdapter(logging.getLogger(__name__)) + + def main(): + logger.debug('Hello, {}', 'world!') + + if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG) + main() + +The above script should log the message ``Hello, world!`` when run with +Python 3.2 or later. + .. currentmodule:: logging -- Repository URL: http://hg.python.org/cpython

1 0

peps: Replace the right PEP
by nick.coghlan March 30, 2013

March 30, 2013

http://hg.python.org/peps/rev/3b67372b39ba changeset: 4829:3b67372b39ba user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sat Mar 30 21:39:06 2013 +1000 summary: Replace the right PEP files: pep-0426.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0426.txt b/pep-0426.txt --- a/pep-0426.txt +++ b/pep-0426.txt @@ -13,7 +13,7 @@ Requires: 440 Created: 30 Aug 2012 Post-History: 14 Nov 2012, 5 Feb 2013, 7 Feb 2013, 9 Feb 2013 -Replaces: 425 +Replaces: 345 Abstract -- Repository URL: http://hg.python.org/peps

1 0