[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #25615: Merge glob doc from 3.4 into 3.5
martin.panter
python-checkins at python.org
Mon Nov 16 19:31:53 EST 2015
https://hg.python.org/cpython/rev/f928dcb448a9
changeset: 99182:f928dcb448a9
branch: 3.5
parent: 99178:4f8c871616e8
parent: 99181:7ca6a13db0e5
user: Martin Panter <vadmium+py at gmail.com>
date: Tue Nov 17 00:19:10 2015 +0000
summary:
Issue #25615: Merge glob doc from 3.4 into 3.5
files:
Doc/library/glob.rst | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -12,13 +12,13 @@
--------------
The :mod:`glob` module finds all the pathnames matching a specified pattern
-according to the rules used by the Unix shell. No tilde expansion is done, but
-``*``, ``?``, and character ranges expressed with ``[]`` will be correctly
-matched. This is done by using the :func:`os.listdir` and
-:func:`fnmatch.fnmatch` functions in concert, and not by actually invoking a
-subshell. Note that unlike :func:`fnmatch.fnmatch`, :mod:`glob` treats
-filenames beginning with a dot (``.``) as special cases. (For tilde and shell
-variable expansion, use :func:`os.path.expanduser` and
+according to the rules used by the Unix shell, although results are returned in
+arbitrary order. No tilde expansion is done, but ``*``, ``?``, and character
+ranges expressed with ``[]`` will be correctly matched. This is done by using
+the :func:`os.listdir` and :func:`fnmatch.fnmatch` functions in concert, and
+not by actually invoking a subshell. Note that unlike :func:`fnmatch.fnmatch`,
+:mod:`glob` treats filenames beginning with a dot (``.``) as special cases.
+(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.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list