diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-17 17:39:11 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-17 17:39:11 +0200 |
| commit | e0321f45fbc45bd06ca256144f6f48dc1347812a (patch) | |
| tree | 67526135d0de149e8b1969636a6421fcf04429ac | |
| parent | 10f19812b54c5aa96e33335bed56247be97e0cc8 (diff) | |
| parent | 9c594af3dd7bc020057b3559cf940cdfab89f177 (diff) | |
| download | cpython-git-e0321f45fbc45bd06ca256144f6f48dc1347812a.tar.gz | |
#16420: merge with 3.3.
| -rw-r--r-- | Doc/library/fnmatch.rst | 5 | ||||
| -rw-r--r-- | Doc/library/glob.rst | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst index 4ba6b77f8e..e0434b0c19 100644 --- a/Doc/library/fnmatch.rst +++ b/Doc/library/fnmatch.rst @@ -29,6 +29,9 @@ special characters used in shell-style wildcards are: | ``[!seq]`` | matches any character not in *seq* | +------------+------------------------------------+ +For a literal match, wrap the meta-characters in brackets. +For example, ``'[?]'`` matches the character ``'?'``. + .. index:: module: glob Note that the filename separator (``'/'`` on Unix) is *not* special to this @@ -74,8 +77,6 @@ patterns. Return the shell-style *pattern* converted to a regular expression. - Be aware there is no way to quote meta-characters. - Example: >>> import fnmatch, re diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst index 3d31c116c8..25843619c0 100644 --- a/Doc/library/glob.rst +++ b/Doc/library/glob.rst @@ -19,6 +19,9 @@ matched. This is done by using the :func:`os.listdir` and subshell. (For tilde and shell variable expansion, use :func:`os.path.expanduser` and :func:`os.path.expandvars`.) +For a literal match, wrap the meta-characters in brackets. +For example, ``'[?]'`` matches the character ``'?'``. + .. function:: glob(pathname) |