From: Fred Drake <fdrake@acm.org>
Date: Tue, 3 Dec 2002 18:50:42 +0000 (+0000)
Subject: Fix example regular expressions that simulate scanf() constructs.
X-Git-Tag: v2.2.3c1~211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66b52427516de717d1bb3acb2119718f2e36cad0;p=thirdparty%2FPython%2Fcpython.git

Fix example regular expressions that simulate scanf() constructs.
---

diff --git a/Doc/ACKS b/Doc/ACKS
index 60ed2ad6e1d6..c2108d50e22e 100644
--- a/Doc/ACKS
+++ b/Doc/ACKS
@@ -129,6 +129,7 @@ Sjoerd Mullender
 Dale Nagata
 Ng Pheng Siong
 Koray Oner
+Tomas Oppelstrup
 Denis S. Otkidach
 Zooko O'Whielacronx
 William Park
diff --git a/Doc/lib/libre.tex b/Doc/lib/libre.tex
index e4d9dda97f48..ed361f85be30 100644
--- a/Doc/lib/libre.tex
+++ b/Doc/lib/libre.tex
@@ -875,11 +875,11 @@ offers some more-or-less equivalent mappings between
   \lineii{\code{\%5c}}
          {\regexp{.\{5\}}}
   \lineii{\code{\%d}}
-         {\regexp{[-+]\e d+}}
+         {\regexp{[-+]?\e d+}}
   \lineii{\code{\%e}, \code{\%E}, \code{\%f}, \code{\%g}}
-         {\regexp{[-+](\e d+(\e.\e d*)?|\e d*\e.\e d+)([eE]\e d+)?}}
+         {\regexp{[-+]?(\e d+(\e.\e d*)?|\e d*\e.\e d+)([eE]\e d+)?}}
   \lineii{\code{\%i}}
-         {\regexp{[-+](0[xX][\e dA-Fa-f]+|0[0-7]*|\e d+)}}
+         {\regexp{[-+]?(0[xX][\e dA-Fa-f]+|0[0-7]*|\e d+)}}
   \lineii{\code{\%o}}
          {\regexp{0[0-7]*}}
   \lineii{\code{\%s}}