Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

forward merge from 3.1

This commit is contained in:
Senthil Kumaran 2011-03-12 11:42:33 +08:00
parent dd8f2e7edf abd4a05561
commit e858bca356
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Doc/library/re.rst
View File

@ -295,11 +295,12 @@ The special characters are:
match at the beginning of the string being searched. match at the beginning of the string being searched.
``(?(id/name)yes-pattern|no-pattern)`` ``(?(id/name)yes-pattern|no-pattern)``
Will try to match with ``yes-pattern`` if the group with given *id* or *name* Will try to match with ``yes-pattern`` if the group with given *id* or
exists, and with ``no-pattern`` if it doesn't. ``no-pattern`` is optional and *name* exists, and with ``no-pattern`` if it doesn't. ``no-pattern`` is
can be omitted. For example, ``(<)?(\w+@\w+(?:\.\w+)+)(?(1)>)`` is a poor email optional and can be omitted. For example,
matching pattern, which will match with ``'<user@host.com>'`` as well as ``(<)?(\w+@\w+(?:\.\w+)+)(?(1)>|$)`` is a poor email matching pattern, which
``'user@host.com'``, but not with ``'<user@host.com'``. will match with ``'<user@host.com>'`` as well as ``'user@host.com'``, but
not with ``'<user@host.com'`` nor ``'user@host.com>'`` .
The special sequences consist of ``'\'`` and a character from the list below. The special sequences consist of ``'\'`` and a character from the list below.