[Python-checkins] CVS: python/dist/src/Doc/lib libre.tex,1.60,1.60.2.1

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv21683/lib

Modified Files:
      Tag: release21-maint
	libre.tex 
Log Message:

Suggestion from Keith Briggs:  refer to RE objects consistently instead of
introducing a new term ("regex") without defining it.


Index: libre.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libre.tex,v
retrieving revision 1.60
retrieving revision 1.60.2.1
diff -C2 -r1.60 -r1.60.2.1
*** libre.tex	2001/04/12 16:47:17	1.60
--- libre.tex	2001/04/18 17:27:10	1.60.2.1
***************
*** 392,396 ****
  expression will be used several times in a single program.
  %(The compiled version of the last pattern passed to
! %\function{regex.match()} or \function{regex.search()} is cached, so
  %programs that use only a single regular expression at a time needn't
  %worry about compiling regular expressions.)
--- 392,396 ----
  expression will be used several times in a single program.
  %(The compiled version of the last pattern passed to
! %\function{re.match()} or \function{re.search()} is cached, so
  %programs that use only a single regular expression at a time needn't
  %worry about compiling regular expressions.)
***************
*** 515,521 ****
  \end{verbatim}
  
! The pattern may be a string or a 
! regex object; if you need to specify
! regular expression flags, you must use a regex object, or use
  embedded modifiers in a pattern; e.g.
  \samp{sub("(?i)b+", "x", "bbbb BBBB")} returns \code{'x x'}.
--- 515,520 ----
  \end{verbatim}
  
! The pattern may be a string or an RE object; if you need to specify
! regular expression flags, you must use a RE object, or use
  embedded modifiers in a pattern; e.g.
  \samp{sub("(?i)b+", "x", "bbbb BBBB")} returns \code{'x x'}.
***************
*** 624,628 ****
  
  \begin{memberdesc}[RegexObject]{flags}
! The flags argument used when the regex object was compiled, or
  \code{0} if no flags were provided.
  \end{memberdesc}
--- 623,627 ----
  
  \begin{memberdesc}[RegexObject]{flags}
! The flags argument used when the RE object was compiled, or
  \code{0} if no flags were provided.
  \end{memberdesc}
***************
*** 635,639 ****
  
  \begin{memberdesc}[RegexObject]{pattern}
! The pattern string from which the regex object was compiled.
  \end{memberdesc}
  
--- 634,638 ----
  
  \begin{memberdesc}[RegexObject]{pattern}
! The pattern string from which the RE object was compiled.
  \end{memberdesc}
  
***************
*** 733,744 ****
  \begin{memberdesc}[MatchObject]{pos}
  The value of \var{pos} which was passed to the
! \function{search()} or \function{match()} function.  This is the index into
! the string at which the regex engine started looking for a match. 
  \end{memberdesc}
  
  \begin{memberdesc}[MatchObject]{endpos}
  The value of \var{endpos} which was passed to the
! \function{search()} or \function{match()} function.  This is the index into
! the string beyond which the regex engine will not go.
  \end{memberdesc}
  
--- 732,743 ----
  \begin{memberdesc}[MatchObject]{pos}
  The value of \var{pos} which was passed to the
! \function{search()} or \function{match()} function.  This is the index
! into the string at which the RE engine started looking for a match. 
  \end{memberdesc}
  
  \begin{memberdesc}[MatchObject]{endpos}
  The value of \var{endpos} which was passed to the
! \function{search()} or \function{match()} function.  This is the index
! into the string beyond which the RE engine will not go.
  \end{memberdesc}