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

Merged revisions 83217 via svnmerge from 

svn+ssh://svn.python.org/python/branches/py3k

........
  r83217 | georg.brandl | 2010-07-29 13:15:36 +0200 (Do, 29 Jul 2010) | 1 line

  Remove Python 1.5 compatibility note.
........
This commit is contained in:
Georg Brandl 2010-08-01 21:09:16 +00:00
parent e321581969
commit 4c07cdc0c7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Doc/library/re.rst
View File

@ -485,7 +485,7 @@ form.
Note that for backward compatibility, the :const:`re.U` flag still
exists (as well as its synonym :const:`re.UNICODE` and its embedded
counterpart ``(?u)``), but these are redundant in Python 3.0 since
counterpart ``(?u)``), but these are redundant in Python 3 since
matches are Unicode by default for strings (and Unicode matching
isn't allowed for bytes).
@ -504,7 +504,7 @@ form.
Make ``\w``, ``\W``, ``\b``, ``\B``, ``\s`` and ``\S`` dependent on the
current locale. The use of this flag is discouraged as the locale mechanism
is very unreliable, and it only handles one "culture" at a time anyway;
you should use Unicode matching instead, which is the default in Python 3.0
you should use Unicode matching instead, which is the default in Python 3
for Unicode (str) patterns.
@ -888,10 +888,7 @@ Match Objects
Return a tuple containing all the subgroups of the match, from 1 up to however
many groups are in the pattern. The *default* argument is used for groups that
did not participate in the match; it defaults to ``None``. (Incompatibility
note: in the original Python 1.5 release, if the tuple was one element long, a
string would be returned instead. In later versions (from 1.5.1 on), a
singleton tuple is returned in such cases.)
did not participate in the match; it defaults to ``None``.
For example:
@ -1113,7 +1110,7 @@ recursion, you may encounter a :exc:`RuntimeError` exception with the message
>>> re.match('Begin (\w| )*? end', s).end()
Traceback (most recent call last):
File "<stdin>", line 1, in ?
File "/usr/local/lib/python2.5/re.py", line 132, in match
File "/usr/local/lib/python3.1/re.py", line 132, in match
return _compile(pattern, flags).match(string)
RuntimeError: maximum recursion limit exceeded