[Python-checkins] r75042 - in python/branches/release31-maint: Doc/library/fnmatch.rst

Wed Sep 23 23:44:27 CEST 2009

Author: ezio.melotti
Date: Wed Sep 23 23:44:27 2009
New Revision: 75042
Log:
Merged revisions 75041 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r75041 | ezio.melotti | 2009年09月24日 00:42:25 +0300 (2009年9月24日) | 9 lines
 
 Merged revisions 75039 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r75039 | ezio.melotti | 2009年09月24日 00:36:39 +0300 (2009年9月24日) | 1 line
 
 improved phrasing, markup and example
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Doc/library/fnmatch.rst
Modified: python/branches/release31-maint/Doc/library/fnmatch.rst
==============================================================================

--- python/branches/release31-maint/Doc/library/fnmatch.rst	(original)
+++ python/branches/release31-maint/Doc/library/fnmatch.rst	Wed Sep 23 23:44:27 2009
@@ -36,11 +36,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``::
@@ -55,8 +56,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)
@@ -77,7 +78,7 @@
 >>> regex
 '.*\\.txt$'
 >>> reobj = re.compile(regex)
- >>> print(reobj.match('foobar.txt'))
+ >>> reobj.match('foobar.txt')
 <_sre.SRE_Match object at 0x...>
 
 
