Merged revisions 75039 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75039 | ezio.melotti | 2009-09-24 00:36:39 +0300 (Thu, 24 Sep 2009) | 1 line
improved phrasing, markup and example
........
diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst
index ce49a39..67aa2f4 100644
--- a/Doc/library/fnmatch.rst
+++ b/Doc/library/fnmatch.rst
@@ -37,11 +37,12 @@
.. function:: fnmatch(filename, pattern)
- Test whether the *filename* string matches the *pattern* string, returning true
- or 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. If you require a case-sensitive comparison regardless of whether
- that's standard for your operating system, use :func:`fnmatchcase` instead.
+ 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
+ case-sensitive comparison, regardless of whether that's standard for the
+ operating system.
This example will print all file names in the current directory with the
extension ``.txt``::
@@ -56,8 +57,8 @@
.. function:: fnmatchcase(filename, pattern)
- Test whether *filename* matches *pattern*, returning true or false; the
- comparison is case-sensitive.
+ Test whether *filename* matches *pattern*, returning :const:`True` or
+ :const:`False`; the comparison is case-sensitive.
.. function:: filter(names, pattern)
@@ -80,7 +81,7 @@
>>> regex
'.*\\.txt$'
>>> reobj = re.compile(regex)
- >>> print reobj.match('foobar.txt')
+ >>> reobj.match('foobar.txt')
<_sre.SRE_Match object at 0x...>