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

#14519: merge with 3.2.

This commit is contained in:
Ezio Melotti 2012-04-29 11:48:54 +03:00
parent ec5cf095a9 a0b1d1eea2
commit 5fe0f4e369
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/re.rst
View File

@ -1075,13 +1075,13 @@ expressions.
+--------------------------------+---------------------------------------------+
| ``%i`` | ``[-+]?(0[xX][\dA-Fa-f]+|0[0-7]*|\d+)`` |
+--------------------------------+---------------------------------------------+
| ``%o`` | ``0[0-7]*`` |
| ``%o`` | ``[-+]?[0-7]+`` |
+--------------------------------+---------------------------------------------+
| ``%s`` | ``\S+`` |
+--------------------------------+---------------------------------------------+
| ``%u`` | ``\d+`` |
+--------------------------------+---------------------------------------------+
| ``%x``, ``%X`` | ``0[xX][\dA-Fa-f]+`` |
| ``%x``, ``%X`` | ``[-+]?(0[xX])?[\dA-Fa-f]+`` |
+--------------------------------+---------------------------------------------+
To extract the filename and numbers from a string like ::