summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-17 00:19:27 +0000
committerMartin Panter <vadmium+py@gmail.com>2015-11-17 00:19:27 +0000
commit27b735ab0fee0efa7c0c60539919bdac3bdcab4c (patch)
tree97653c01366fe6882d1dcd2be047f033f51a6216
parent43b53091f08204c7aa5f539697d75c99ac4cb96f (diff)
parent4eccf4b1ac15b81c96b97d8c0cc87e7791c1b7f6 (diff)
downloadcpython-git-27b735ab0fee0efa7c0c60539919bdac3bdcab4c.tar.gz
Issue #25615: Merge glob doc from 3.5
-rw-r--r--Doc/library/glob.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
index d16b001f52..4c01bf6f1e 100644
--- 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.