#14519: merge with 3.2.

5fe0f4e3 · Ezio Melotti · ec5cf095 · a0b1d1ee · 5fe0f4e3
Commit 5fe0f4e3 authored Apr 29, 2012 by Ezio Melotti
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Doc/library/re.rst Doc/library/re.rst +2 -2

No files found.
--- 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 ::