mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-15 11:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge with 3.2.

Browse source
This commit is contained in:
Georg Brandl 2012-03-10 09:27:30 +01:00
commit 6aacc14e29
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Doc/reference/compound_stmts.rst
View file

@ -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 access the local variables of the function containing the def. See section
:ref:`naming` for details. :ref:`naming` for details.
.. seealso::
:pep:`3107` - Function Annotations
The original specification for function annotations.
.. _class: .. _class:

11
Lib/re.py
View file

@ -179,14 +179,19 @@ def subn(pattern, repl, string, count=0, flags=0):
def split(pattern, string, maxsplit=0, flags=0): def split(pattern, string, maxsplit=0, flags=0):
"""Split the source string by the occurrences of the pattern, """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) return _compile(pattern, flags).split(string, maxsplit)
def findall(pattern, string, flags=0): def findall(pattern, string, flags=0):
"""Return a list of all non-overlapping matches in the string. """Return a list of all non-overlapping matches in the string.
If one or more groups are present in the pattern, return a If one or more capturing groups are present in the pattern, return
list of groups; this will be a list of tuples if the pattern a list of groups; this will be a list of tuples if the pattern
has more than one group. has more than one group.
Empty matches are included in the result.""" Empty matches are included in the result."""