diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-04-29 08:48:54 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-04-29 08:48:54 (GMT) |
| commit | 5fe0f4e369328212f5d6c14e39ed54d614dcb988 (patch) | |
| tree | 3fdb4d7edd69e0c3b6f4ec446b26cd36e4a1b719 /Doc/library | |
| parent | ec5cf095a9d658fad092d77fe7825933abd3cc5b (diff) | |
| parent | a0b1d1eea2aed2ed04b8cf62f2d34038e1bfc9b6 (diff) | |
| download | cpython-5fe0f4e369328212f5d6c14e39ed54d614dcb988.zip cpython-5fe0f4e369328212f5d6c14e39ed54d614dcb988.tar.gz cpython-5fe0f4e369328212f5d6c14e39ed54d614dcb988.tar.bz2 | |
#14519: merge with 3.2.
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/re.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 7f79e58..d8ead68 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -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 :: |