[Python-checkins] cpython (merge 3.2 -> 3.3): #16420: merge with 3.2.
ezio.melotti
python-checkins at python.org
Sat Nov 17 16:39:27 CET 2012
http://hg.python.org/cpython/rev/2208061d863c
changeset: 80471:2208061d863c
branch: 3.3
parent: 80467:358be7742377
parent: 80470:168f36c2b5ea
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sat Nov 17 17:38:58 2012 +0200
summary:
#16420: merge with 3.2.
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