summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2016-01-11 22:09:13 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2016-01-11 22:09:13 (GMT)
commit84c63e8df4f48a34ad20829125c12db71314f9ef (patch)
tree8ecd902daddfd6f184d993071cb3b9c5f40dd97e /Doc/howto
parent7c018aa377bd25c34e09ad2e9e6740b2bc226493 (diff)
downloadcpython-84c63e8df4f48a34ad20829125c12db71314f9ef.zip
cpython-84c63e8df4f48a34ad20829125c12db71314f9ef.tar.gz
cpython-84c63e8df4f48a34ad20829125c12db71314f9ef.tar.bz2
#25517: fix regex in the regex howto. Patch by Elena Oat.
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/regex.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index ad2c6ab..70721a9 100644
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -1004,17 +1004,18 @@ confusing.
A negative lookahead cuts through all this confusion:
-``.*[.](?!bat$).*$`` The negative lookahead means: if the expression ``bat``
+``.*[.](?!bat$)[^.]*$`` The negative lookahead means: if the expression ``bat``
doesn't match at this point, try the rest of the pattern; if ``bat$`` does
match, the whole pattern will fail. The trailing ``$`` is required to ensure
that something like ``sample.batch``, where the extension only starts with
-``bat``, will be allowed.
+``bat``, will be allowed. The ``[^.]*`` makes sure that the pattern works
+when there are multiple dots in the filename.
Excluding another filename extension is now easy; simply add it as an
alternative inside the assertion. The following pattern excludes filenames that
end in either ``bat`` or ``exe``:
-``.*[.](?!bat$|exe$).*$``
+``.*[.](?!bat$|exe$)[^.]*$``
Modifying Strings