summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2002-12-03 18:49:17 (GMT)
committerFred Drake <fdrake@acm.org>2002-12-03 18:49:17 (GMT)
commit7af24bd23746f3c32cb77cf3960e8cd24ccc4944 (patch)
tree0f0a452ceb98712e42b7f585b7b8eeca02b35f73
parent71aa6d6db902455d1044e3348c80763f0e0ce639 (diff)
downloadcpython-7af24bd23746f3c32cb77cf3960e8cd24ccc4944.zip
cpython-7af24bd23746f3c32cb77cf3960e8cd24ccc4944.tar.gz
cpython-7af24bd23746f3c32cb77cf3960e8cd24ccc4944.tar.bz2
Fix example regular expressions that simulate scanf() constructs.
-rw-r--r--Doc/ACKS1
-rw-r--r--Doc/lib/libre.tex6
2 files changed, 4 insertions, 3 deletions
diff --git a/Doc/ACKS b/Doc/ACKS
index 7f19f23..e5d6297 100644
--- a/Doc/ACKS
+++ b/Doc/ACKS
@@ -130,6 +130,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 d48b1b8..7482b9c 100644
--- a/Doc/lib/libre.tex
+++ b/Doc/lib/libre.tex
@@ -860,11 +860,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}}