Mailman 3 July 2011 - Python-checkins

cpython (3.2): add space
by benjamin.peterson July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/99e9816b7d8b changeset: 71634:99e9816b7d8b branch: 3.2 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jul 30 09:59:50 2011 -0500 summary: add space files: Doc/library/stdtypes.rst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2711,6 +2711,7 @@ It is written as ``Ellipsis`` or ``...``. + The NotImplemented Object ------------------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): document NotImplemented
by benjamin.peterson July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/1707b7d7da51 changeset: 71633:1707b7d7da51 branch: 3.2 parent: 71631:febf911c2e95 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jul 30 09:57:24 2011 -0500 summary: document NotImplemented files: Doc/library/stdtypes.rst | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2711,6 +2711,15 @@ It is written as ``Ellipsis`` or ``...``. +The NotImplemented Object +------------------------- + +This object is returned from comparisons and binary operations when they are +asked to operate on types they don't support. See :ref:`comparisons` for more +information. + +It is written as ``NotImplemented``. + Boolean Values -------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge from 3.2 - heads
by eli.bendersky July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/8d1a046441ea changeset: 71632:8d1a046441ea parent: 71630:27b588dd6155 parent: 71631:febf911c2e95 user: Eli Bendersky <eliben(a)gmail.com> date: Sat Jul 30 11:37:06 2011 +0300 summary: merge from 3.2 - heads files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge 3.2: Issue #11699: fix documentation of OptionParser.get_option_group.
by eli.bendersky July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/27b588dd6155 changeset: 71630:27b588dd6155 parent: 71627:44641e94eeb8 parent: 71629:cfb60dfa7734 user: Eli Bendersky <eliben(a)gmail.com> date: Sat Jul 30 11:24:38 2011 +0300 summary: Merge 3.2: Issue #11699: fix documentation of OptionParser.get_option_group. Patch by Petri Lehtinen files: Doc/library/optparse.rst | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -655,8 +655,9 @@ .. method:: OptionParser.get_option_group(opt_str) - Return, if defined, the :class:`OptionGroup` that has the title or the long - description equals to *opt_str* + Return the :class:`OptionGroup` to which the short or long option + string *opt_str* (e.g. ``'-o'`` or ``'--option'``) belongs. If + there's no such :class:`OptionGroup`, return ``None``. .. _optparse-printing-version-string: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> 3.2): merging Georg's revision
by eli.bendersky July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/febf911c2e95 changeset: 71631:febf911c2e95 branch: 3.2 parent: 71629:cfb60dfa7734 parent: 71626:4bcfb24c7f1f user: Eli Bendersky <eliben(a)gmail.com> date: Sat Jul 30 11:36:41 2011 +0300 summary: merging Georg's revision files: Doc/library/test.rst | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Doc/library/test.rst b/Doc/library/test.rst --- a/Doc/library/test.rst +++ b/Doc/library/test.rst @@ -187,19 +187,24 @@ regression tests. -:mod:`test.support` --- Utility functions for tests -=================================================== +:mod:`test.support` --- Utilities for the Python test suite +=========================================================== .. module:: test.support - :synopsis: Support for Python regression tests. + :synopsis: Support for Python's regression test suite. The :mod:`test.support` module provides support for Python's regression -tests. +test suite. + +.. note:: + :mod:`test.support` is not a public module. It is documented here to help + Python developers write tests. The API of this module is subject to change + without backwards compatibility concerns between releases. + This module defines the following exceptions: - .. exception:: TestFailed Exception to be raised when a test fails. This is deprecated in favor of @@ -213,9 +218,9 @@ network connection) is not available. Raised by the :func:`requires` function. + The :mod:`test.support` module defines the following constants: - .. data:: verbose :const:`True` when verbose output is enabled. Should be checked when more @@ -233,9 +238,9 @@ Set to a name that is safe to use as the name of a temporary file. Any temporary file that is created should be closed and unlinked (removed). + The :mod:`test.support` module defines the following functions: - .. function:: forget(module_name) Remove the module named *module_name* from ``sys.modules`` and delete any -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #11699: fix documentation of OptionParser.get_option_group. Patch by
by eli.bendersky July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/cfb60dfa7734 changeset: 71629:cfb60dfa7734 branch: 3.2 parent: 71624:a8aa918041c2 user: Eli Bendersky <eliben(a)gmail.com> date: Sat Jul 30 11:14:32 2011 +0300 summary: Issue #11699: fix documentation of OptionParser.get_option_group. Patch by Petri Lehtinen files: Doc/library/optparse.rst | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -655,8 +655,9 @@ .. method:: OptionParser.get_option_group(opt_str) - Return, if defined, the :class:`OptionGroup` that has the title or the long - description equals to *opt_str* + Return the :class:`OptionGroup` to which the short or long option + string *opt_str* (e.g. ``'-o'`` or ``'--option'``) belongs. If + there's no such :class:`OptionGroup`, return ``None``. .. _optparse-printing-version-string: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #11699: fix documentation of OptionParser.get_option_group. Patch by
by eli.bendersky July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/5a248fcfa112 changeset: 71628:5a248fcfa112 branch: 2.7 parent: 71607:df415bfbb652 user: Eli Bendersky <eliben(a)gmail.com> date: Sat Jul 30 11:12:45 2011 +0300 summary: Issue #11699: fix documentation of OptionParser.get_option_group. Patch by Petri Lehtinen files: Doc/library/optparse.rst | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -657,8 +657,9 @@ .. method:: OptionParser.get_option_group(opt_str) - Return, if defined, the :class:`OptionGroup` that has the title or the long - description equals to *opt_str* + Return the :class:`OptionGroup` to which the short or long option + string *opt_str* (e.g. ``'-o'`` or ``'--option'``) belongs. If + there's no such :class:`OptionGroup`, return ``None``. .. _optparse-printing-version-string: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge with 3.2.
by georg.brandl July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/44641e94eeb8 changeset: 71627:44641e94eeb8 parent: 71625:221ca00121ef parent: 71626:4bcfb24c7f1f user: Georg Brandl <georg(a)python.org> date: Sat Jul 30 09:01:03 2011 +0200 summary: Merge with 3.2. files: Doc/library/test.rst | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Doc/library/test.rst b/Doc/library/test.rst --- a/Doc/library/test.rst +++ b/Doc/library/test.rst @@ -187,19 +187,24 @@ regression tests. -:mod:`test.support` --- Utility functions for tests -=================================================== +:mod:`test.support` --- Utilities for the Python test suite +=========================================================== .. module:: test.support - :synopsis: Support for Python regression tests. + :synopsis: Support for Python's regression test suite. The :mod:`test.support` module provides support for Python's regression -tests. +test suite. + +.. note:: + :mod:`test.support` is not a public module. It is documented here to help + Python developers write tests. The API of this module is subject to change + without backwards compatibility concerns between releases. + This module defines the following exceptions: - .. exception:: TestFailed Exception to be raised when a test fails. This is deprecated in favor of @@ -213,9 +218,9 @@ network connection) is not available. Raised by the :func:`requires` function. + The :mod:`test.support` module defines the following constants: - .. data:: verbose ``True`` when verbose output is enabled. Should be checked when more @@ -236,7 +241,6 @@ The :mod:`test.support` module defines the following functions: - .. function:: forget(module_name) Remove the module named *module_name* from ``sys.modules`` and delete any -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Change test.support docs to be more specific about the nature of this module.
by georg.brandl July 30, 2011

July 30, 2011

http://hg.python.org/cpython/rev/4bcfb24c7f1f changeset: 71626:4bcfb24c7f1f branch: 3.2 parent: 71624:a8aa918041c2 user: Georg Brandl <georg(a)python.org> date: Sat Jul 30 09:00:48 2011 +0200 summary: Change test.support docs to be more specific about the nature of this module. files: Doc/library/test.rst | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Doc/library/test.rst b/Doc/library/test.rst --- a/Doc/library/test.rst +++ b/Doc/library/test.rst @@ -187,19 +187,24 @@ regression tests. -:mod:`test.support` --- Utility functions for tests -=================================================== +:mod:`test.support` --- Utilities for the Python test suite +=========================================================== .. module:: test.support - :synopsis: Support for Python regression tests. + :synopsis: Support for Python's regression test suite. The :mod:`test.support` module provides support for Python's regression -tests. +test suite. + +.. note:: + :mod:`test.support` is not a public module. It is documented here to help + Python developers write tests. The API of this module is subject to change + without backwards compatibility concerns between releases. + This module defines the following exceptions: - .. exception:: TestFailed Exception to be raised when a test fails. This is deprecated in favor of @@ -213,9 +218,9 @@ network connection) is not available. Raised by the :func:`requires` function. + The :mod:`test.support` module defines the following constants: - .. data:: verbose :const:`True` when verbose output is enabled. Should be checked when more @@ -233,9 +238,9 @@ Set to a name that is safe to use as the name of a temporary file. Any temporary file that is created should be closed and unlinked (removed). + The :mod:`test.support` module defines the following functions: - .. function:: forget(module_name) Remove the module named *module_name* from ``sys.modules`` and delete any -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge from 3.2: Issue #12531: add index entries to documentation of * and ** in
by eli.bendersky July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/221ca00121ef changeset: 71625:221ca00121ef parent: 71623:dc898f2a04ca parent: 71624:a8aa918041c2 user: Eli Bendersky <eliben(a)gmail.com> date: Sat Jul 30 07:07:29 2011 +0300 summary: Merge from 3.2: Issue #12531: add index entries to documentation of * and ** in function calls files: Doc/reference/expressions.rst | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -667,12 +667,15 @@ and the argument values as corresponding values), or a (new) empty dictionary if there were no excess keyword arguments. +.. index:: + single: *; in function calls + If the syntax ``*expression`` appears in the function call, ``expression`` must -evaluate to a sequence. Elements from this sequence are treated as if they were -additional positional arguments; if there are positional arguments *x1*,..., -*xN*, and ``expression`` evaluates to a sequence *y1*, ..., *yM*, this is -equivalent to a call with M+N positional arguments *x1*, ..., *xN*, *y1*, ..., -*yM*. +evaluate to an iterable. Elements from this iterable are treated as if they +were additional positional arguments; if there are positional arguments +*x1*, ... ,*xN*, and ``expression`` evaluates to a sequence *y1*, ..., *yM*, +this is equivalent to a call with M+N positional arguments *x1*, ..., *xN*, +*y1*, ..., *yM*. A consequence of this is that although the ``*expression`` syntax may appear *after* some keyword arguments, it is processed *before* the keyword arguments @@ -693,6 +696,9 @@ It is unusual for both keyword arguments and the ``*expression`` syntax to be used in the same call, so in practice this confusion does not arise. +.. index:: + single: **; in function calls + If the syntax ``**expression`` appears in the function call, ``expression`` must evaluate to a mapping, the contents of which are treated as additional keyword arguments. In the case of a keyword appearing in both ``expression`` and as an -- Repository URL: http://hg.python.org/cpython

1 0