[Python-checkins] cpython: docs.inspect: Fix BoundArguments example. Issue #22998.

Fri Dec 5 05:34:18 CET 2014

On 12/4/2014 10:49 PM, yury.selivanov wrote:
> https://hg.python.org/cpython/rev/697adefaba6b
> changeset: 93730:697adefaba6b
> parent: 93728:2fa3c68de07e
> user: Yury Selivanov <yselivanov at sprymix.com>
> date: Thu Dec 04 22:48:47 2014 -0500
> summary:
> docs.inspect: Fix BoundArguments example. Issue #22998.
>> files:
> Doc/library/inspect.rst | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>>> diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
> --- a/Doc/library/inspect.rst
> +++ b/Doc/library/inspect.rst
> @@ -678,7 +678,8 @@
> ((5,), {})
>> >>> for param in sig.parameters.values():
> - ... if param.name not in ba.arguments:
> + ... if (param.name not in ba.arguments
> + ... and param.default is not param.empty):
> ... ba.arguments[param.name] = param.default
>> >>> ba.args, ba.kwargs

Yury, it appears that you patched 3.5 directly instead of merging the 
3.4 commit 71c38c233e5c into 3.5. The result was that the 3.4 commit 
was left unmerged, potentially interfering with the next person doing a 
merge. I believe I fixed it with what seems effectively to be a null merge.
Terry