summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariatta <Mariatta@users.noreply.github.com>2017-06-10 14:26:08 (GMT)
committerGitHub <noreply@github.com>2017-06-10 14:26:08 (GMT)
commit656f232131e7a49800662119c7f9b8078729e697 (patch)
treec003371dadd600ddcdbe14af6db8c33685ab9abf
parent1395c58ef7b98f087d1d5d50962fe7a8c032f34d (diff)
downloadcpython-656f232131e7a49800662119c7f9b8078729e697.zip
cpython-656f232131e7a49800662119c7f9b8078729e697.tar.gz
cpython-656f232131e7a49800662119c7f9b8078729e697.tar.bz2
bpo-25409: Clarify fnmatch and fnmatchcase documentation (GH-1535) (GH-2066)
Mention that fnmatchcase does not call normcase, and fnmatch does. (cherry picked from commit e5f6e86c48c7b2eb9e1d6a0e72867b4d8b4720f3)
-rw-r--r--Doc/library/fnmatch.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst
index 9fc9c7c..670b176 100644
--- a/Doc/library/fnmatch.rst
+++ b/Doc/library/fnmatch.rst
@@ -43,9 +43,8 @@ patterns.
.. function:: fnmatch(filename, pattern)
Test whether the *filename* string matches the *pattern* string, returning
- :const:`True` or :const:`False`. If the operating system is case-insensitive,
- then both parameters will be normalized to all lower- or upper-case before
- the comparison is performed. :func:`fnmatchcase` can be used to perform a
+ :const:`True` or :const:`False`. Both parameters are case-normalized
+ using :func:`os.path.normcase`. :func:`fnmatchcase` can be used to perform a
case-sensitive comparison, regardless of whether that's standard for the
operating system.
@@ -63,7 +62,8 @@ patterns.
.. function:: fnmatchcase(filename, pattern)
Test whether *filename* matches *pattern*, returning :const:`True` or
- :const:`False`; the comparison is case-sensitive.
+ :const:`False`; the comparison is case-sensitive and does not apply
+ :func:`os.path.normcase`.
.. function:: filter(names, pattern)