[Python-checkins] cpython (3.2): #16420: document a way to escape metacharacters in glob/fnmatch.

ezio.melotti python-checkins at python.org
Sat Nov 17 16:39:26 CET 2012


http://hg.python.org/cpython/rev/168f36c2b5ea
changeset:   80470:168f36c2b5ea
branch:      3.2
parent:      80464:120757b34806
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 17:38:11 2012 +0200
summary:
  #16420: document a way to escape metacharacters in glob/fnmatch.

files:
  Doc/library/fnmatch.rst |  5 +++--
  Doc/library/glob.rst    |  3 +++
  2 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst
--- a/Doc/library/fnmatch.rst
+++ b/Doc/library/fnmatch.rst
@@ -29,6 +29,9 @@
 | ``[!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 @@
 
    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
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -19,6 +19,9 @@
 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)
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list