[Python-checkins] python/dist/src/Doc/ref ref3.tex,1.101,1.102

fdrake@users.sourceforge.net fdrake@users.sourceforge.net
Thu, 20 Mar 2003 10:17:19 -0800


Update of /cvsroot/python/python/dist/src/Doc/ref
In directory sc8-pr-cvs1:/tmp/cvs-serv32744

Modified Files:
	ref3.tex 
Log Message:
- apply SF patch #700798: fixes and cleanups for descriptor info
- use a TeX "tie" to prevent word-wrapping in "section x.y"-like text


Index: ref3.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref3.tex,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** ref3.tex	5 Mar 2003 14:20:58 -0000	1.101
--- ref3.tex	20 Mar 2003 18:17:16 -0000	1.102
***************
*** 408,412 ****
  
  Dictionaries are mutable; they can be created by the
! \code{\{...\}} notation (see section \ref{dict}, ``Dictionary
  Displays'').
  
--- 408,412 ----
  
  Dictionaries are mutable; they can be created by the
! \code{\{...\}} notation (see section~\ref{dict}, ``Dictionary
  Displays'').
  
***************
*** 419,423 ****
  \item[Callable types]
  These\obindex{callable} are the types to which the function call
! operation (see section \ref{calls}, ``Calls'') can be applied:
  \indexii{function}{call}
  \index{invocation}
--- 419,423 ----
  \item[Callable types]
  These\obindex{callable} are the types to which the function call
! operation (see section~\ref{calls}, ``Calls'') can be applied:
  \indexii{function}{call}
  \index{invocation}
***************
*** 428,432 ****
  \item[User-defined functions]
  A user-defined function object is created by a function definition
! (see section \ref{function}, ``Function definitions'').  It should be
  called with an argument
  list containing the same number of items as the function's formal
--- 428,432 ----
  \item[User-defined functions]
  A user-defined function object is created by a function definition
! (see section~\ref{function}, ``Function definitions'').  It should be
  called with an argument
  list containing the same number of items as the function's formal
***************
*** 602,607 ****
  
  \item[Modules]
! Modules are imported by the \keyword{import} statement (see section
! \ref{import}, ``The \keyword{import} statement'').
  A module object has a namespace implemented by a dictionary object
  (this is the dictionary referenced by the func_globals attribute of
--- 602,607 ----
  
  \item[Modules]
! Modules are imported by the \keyword{import} statement (see
! section~\ref{import}, ``The \keyword{import} statement'').
  A module object has a namespace implemented by a dictionary object
  (this is the dictionary referenced by the func_globals attribute of
***************
*** 638,643 ****
  
  \item[Classes]
! Class objects are created by class definitions (see section
! \ref{class}, ``Class definitions'').
  A class has a namespace implemented by a dictionary object.
  Class attribute references are translated to
--- 638,643 ----
  
  \item[Classes]
! Class objects are created by class definitions (see
! section~\ref{class}, ``Class definitions'').
  A class has a namespace implemented by a dictionary object.
  Class attribute references are translated to
***************
*** 709,713 ****
  Class instances can pretend to be numbers, sequences, or mappings if
  they have methods with certain special names.  See
! section \ref{specialnames}, ``Special method names.''
  \obindex{numeric}
  \obindex{sequence}
--- 709,713 ----
  Class instances can pretend to be numbers, sequences, or mappings if
  they have methods with certain special names.  See
! section~\ref{specialnames}, ``Special method names.''
  \obindex{numeric}
  \obindex{sequence}
***************
*** 866,870 ****
  traceback.  When an exception handler is entered, the stack trace is
  made available to the program.
! (See section \ref{try}, ``The \code{try} statement.'')
  It is accessible as \code{sys.exc_traceback}, and also as the third
  item of the tuple returned by \code{sys.exc_info()}.  The latter is
--- 866,870 ----
  traceback.  When an exception handler is entered, the stack trace is
  made available to the program.
! (See section~\ref{try}, ``The \code{try} statement.'')
  It is accessible as \code{sys.exc_traceback}, and also as the third
  item of the tuple returned by \code{sys.exc_info()}.  The latter is
***************
*** 1212,1216 ****
  In order to avoid infinite recursion in this method, its
  implementation should always call the base class method with the same
! name to access any attributes it needs to access, for example,
  \samp{object.__getattribute__(self, name)}.
  \end{methoddesc}
--- 1212,1216 ----
  In order to avoid infinite recursion in this method, its
  implementation should always call the base class method with the same
! name to access any attributes it needs, for example,
  \samp{object.__getattribute__(self, name)}.
  \end{methoddesc}
***************
*** 1219,1230 ****
  
  The following methods only apply when an instance of the class
! containing the method (a so-called \emph{descriptor} class) is in
  the class dictionary of another new-style class, known as the
  \emph{owner} class. In the examples below, ``the attribute'' refers to
! the attribute whose name is the key of the property in the accessed
  class' \code{__dict__}.
  
  \begin{methoddesc}[object]{__get__}{self, instance, owner}
! Called to get the attribute of the owner class (class attribute acess)
  or of an instance of that class (instance attribute acces).
  \var{owner} is always the owner class, while \var{instance} is the
--- 1219,1230 ----
  
  The following methods only apply when an instance of the class
! containing the method (a so-called \emph{descriptor} class) appears in
  the class dictionary of another new-style class, known as the
  \emph{owner} class. In the examples below, ``the attribute'' refers to
! the attribute whose name is the key of the property in the owner
  class' \code{__dict__}.
  
  \begin{methoddesc}[object]{__get__}{self, instance, owner}
! Called to get the attribute of the owner class (class attribute access)
  or of an instance of that class (instance attribute acces).
  \var{owner} is always the owner class, while \var{instance} is the