[Python-checkins] python/dist/src/Doc/lib libfuncs.tex,1.105,1.106 libstdtypes.tex,1.93,1.94

[rhettinger@sourceforge.net]

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

Modified Files:
	libfuncs.tex libstdtypes.tex 
Log Message:
Patch 543387.  Document deprecation of complex %, //,and divmod().

Index: libfuncs.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libfuncs.tex,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** libfuncs.tex	26 Apr 2002 20:29:44 -0000	1.105
--- libfuncs.tex	21 May 2002 18:19:14 -0000	1.106
***************
*** 249,255 ****
  
  \begin{funcdesc}{divmod}{a, b}
!   Take two numbers as arguments and return a pair of numbers consisting
!   of their quotient and remainder when using long division.  With mixed
!   operand types, the rules for binary arithmetic operators apply.  For
    plain and long integers, the result is the same as
    \code{(\var{a} / \var{b}, \var{a} \%{} \var{b})}.
--- 249,255 ----
  
  \begin{funcdesc}{divmod}{a, b}
!   Take two (non complex) numbers as arguments and return a pair of numbers
!   consisting of their quotient and remainder when using long division.  With
!   mixed operand types, the rules for binary arithmetic operators apply.  For
    plain and long integers, the result is the same as
    \code{(\var{a} / \var{b}, \var{a} \%{} \var{b})}.

Index: libstdtypes.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** libstdtypes.tex	15 May 2002 15:45:25 -0000	1.93
--- libstdtypes.tex	21 May 2002 18:19:15 -0000	1.94
***************
*** 219,224 ****
  \bifuncindex{complex}
  
! All numeric types support the following operations, sorted by
! ascending priority (operations in the same box have the same
  priority; all numeric operations have a higher priority than
  comparison operations):
--- 219,224 ----
  \bifuncindex{complex}
  
! All numeric types (except complex) support the following operations,
! sorted by ascending priority (operations in the same box have the same
  priority; all numeric operations have a higher priority than
  comparison operations):
***************
*** 230,234 ****
    \lineiii{\var{x} * \var{y}}{product of \var{x} and \var{y}}{}
    \lineiii{\var{x} / \var{y}}{quotient of \var{x} and \var{y}}{(1)}
!   \lineiii{\var{x} \%{} \var{y}}{remainder of \code{\var{x} / \var{y}}}{}
    \hline
    \lineiii{-\var{x}}{\var{x} negated}{}
--- 230,234 ----
    \lineiii{\var{x} * \var{y}}{product of \var{x} and \var{y}}{}
    \lineiii{\var{x} / \var{y}}{quotient of \var{x} and \var{y}}{(1)}
!   \lineiii{\var{x} \%{} \var{y}}{remainder of \code{\var{x} / \var{y}}}{(4)}
    \hline
    \lineiii{-\var{x}}{\var{x} negated}{}
***************
*** 241,245 ****
    \lineiii{complex(\var{re},\var{im})}{a complex number with real part \var{re}, imaginary part \var{im}.  \var{im} defaults to zero.}{}
    \lineiii{\var{c}.conjugate()}{conjugate of the complex number \var{c}}{}
!   \lineiii{divmod(\var{x}, \var{y})}{the pair \code{(\var{x} / \var{y}, \var{x} \%{} \var{y})}}{(3)}
    \lineiii{pow(\var{x}, \var{y})}{\var{x} to the power \var{y}}{}
    \lineiii{\var{x} ** \var{y}}{\var{x} to the power \var{y}}{}
--- 241,245 ----
    \lineiii{complex(\var{re},\var{im})}{a complex number with real part \var{re}, imaginary part \var{im}.  \var{im} defaults to zero.}{}
    \lineiii{\var{c}.conjugate()}{conjugate of the complex number \var{c}}{}
!   \lineiii{divmod(\var{x}, \var{y})}{the pair \code{(\var{x} / \var{y}, \var{x} \%{} \var{y})}}{(3)(4)}
    \lineiii{pow(\var{x}, \var{y})}{\var{x} to the power \var{y}}{}
    \lineiii{\var{x} ** \var{y}}{\var{x} to the power \var{y}}{}
***************
*** 273,276 ****
--- 273,282 ----
  See section \ref{built-in-funcs}, ``Built-in Functions,'' for a full
  description.
+ 
+ \item[(4)]
+ Complex floor division operator, modulo operator, and \function{divmod()}.
+ 
+ \deprecated{2.3}{Instead convert to float using \function{abs()}
+ if appropriate.}
  
  \end{description}