From 64a40949cf564a690b0263d9b0c18204bceff233 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 10 Mar 2012 09:22:47 +0100 Subject: Closes #14186: add link to PEP 3107 (function annotations) to the function definition section. --- Doc/reference/compound_stmts.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index aea08e0..4ce7324 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -535,6 +535,11 @@ returned or passed around. Free variables used in the nested function can access the local variables of the function containing the def. See section :ref:`naming` for details. +.. seealso:: + + :pep:`3107` - Function Annotations + The original specification for function annotations. + .. _class: -- cgit v0.12 From e144c74e023b9caccd0a23ff718028cdd376cddd Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 10 Mar 2012 09:26:53 +0100 Subject: Closes #14244: add info about capturing groups and maxsplit to the docstring of re.split(). --- Lib/re.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Lib/re.py b/Lib/re.py index 4fe3bd8..3fd59df 100644 --- a/Lib/re.py +++ b/Lib/re.py @@ -179,14 +179,19 @@ def subn(pattern, repl, string, count=0, flags=0): def split(pattern, string, maxsplit=0, flags=0): """Split the source string by the occurrences of the pattern, - returning a list containing the resulting substrings.""" + returning a list containing the resulting substrings. If + capturing parentheses are used in pattern, then the text of all + groups in the pattern are also returned as part of the resulting + list. If maxsplit is nonzero, at most maxsplit splits occur, + and the remainder of the string is returned as the final element + of the list.""" return _compile(pattern, flags).split(string, maxsplit) def findall(pattern, string, flags=0): """Return a list of all non-overlapping matches in the string. - If one or more groups are present in the pattern, return a - list of groups; this will be a list of tuples if the pattern + If one or more capturing groups are present in the pattern, return + a list of groups; this will be a list of tuples if the pattern has more than one group. Empty matches are included in the result.""" -- cgit v0.12