[Python-checkins] CVS: python/dist/src/Doc/ref ref7.tex,1.20,1.21

Thomas Wouters python-dev@python.org
Sun, 31 Dec 2000 14:53:01 -0800


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

Modified Files:
	ref7.tex 
Log Message:

Change documentation of 'else' clause of 'try/except' to make clear that it
doesn't get triggered by 'return', 'break' or 'continue'. If the
'try-inside-continue' patch does not get accepted before next release, the
'or continue' should be removed ;P

Closes SF patch #103045 and SF bug #127098.



Index: ref7.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref7.tex,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** ref7.tex	2000/07/16 19:05:38	1.20
--- ref7.tex	2000/12/31 22:52:59	1.21
***************
*** 243,249 ****
    \ttindex{exc_value}\ttindex{exc_traceback}}
  
! The optional \keyword{else} clause is executed when no exception occurs
! in the \keyword{try} clause.  Exceptions in the \keyword{else} clause are
! not handled by the preceding \keyword{except} clauses.
  \kwindex{else}
  
--- 243,251 ----
    \ttindex{exc_value}\ttindex{exc_traceback}}
  
! The optional \keyword{else} clause is executed when the \keyword{try} clause
! terminates by any means other than an exception or executing a
! \keyword{return}, \keyword{continue} or \keyword{break} statement.  
! Exceptions in the \keyword{else} clause are not handled by the preceding
! \keyword{except} clauses.
  \kwindex{else}