summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-17 00:19:10 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-11-17 00:19:10 (GMT)
commit4eccf4b1ac15b81c96b97d8c0cc87e7791c1b7f6 (patch)
treef1415c61d9afacd64569e268b2f8570a210900dd /Doc
parentcfff959c07428001cf961fcf95e5ef10256ae8c2 (diff)
parent9f3c094e687898be24e70662e7d5c135914d89d8 (diff)
downloadcpython-4eccf4b1ac15b81c96b97d8c0cc87e7791c1b7f6.zip
cpython-4eccf4b1ac15b81c96b97d8c0cc87e7791c1b7f6.tar.gz
cpython-4eccf4b1ac15b81c96b97d8c0cc87e7791c1b7f6.tar.bz2
Issue #25615: Merge glob doc from 3.4 into 3.5
Diffstat (limited to 'Doc')
-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 d16b001..4c01bf6 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.