summaryrefslogtreecommitdiff
path: root/Doc/ref/ref7.tex
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2006-04-23 15:39:16 +0000
committerNick Coghlan <ncoghlan@gmail.com>2006-04-23 15:39:16 +0000
commitfee3dfc061c4312636228aa48e0cf78a647645c9 (patch)
tree580c80508b786c8c491b0ee58b528b7877c8c732 /Doc/ref/ref7.tex
parent3e99c0ad649de0393d9a8af17f34d9d1f55f4ab2 (diff)
downloadcpython-git-fee3dfc061c4312636228aa48e0cf78a647645c9.tar.gz
Update with statement documentation to use same terminology as 2.5a1 implementation
Diffstat (limited to 'Doc/ref/ref7.tex')
-rw-r--r--Doc/ref/ref7.tex13
1 files changed, 6 insertions, 7 deletions
diff --git a/Doc/ref/ref7.tex b/Doc/ref/ref7.tex
index ecbc75614a..d7929af201 100644
--- a/Doc/ref/ref7.tex
+++ b/Doc/ref/ref7.tex
@@ -329,13 +329,12 @@ The execution of the \keyword{with} statement proceeds as follows:
\begin{enumerate}
-\item The expression is evaluated, to obtain a context manager
-object.
+\item The expression is evaluated, to obtain a context object.
-\item The context manager's \method{__context__()} method is invoked to
-obtain a context object.
+\item The context object's \method{__context__()} method is invoked to
+obtain a context manager object.
-\item The context object's \method{__enter__()} method is invoked.
+\item The context manager's \method{__enter__()} method is invoked.
\item If a target list was included in the \keyword{with}
statement, the return value from \method{__enter__()} is assigned to it.
@@ -348,8 +347,8 @@ an error occurring within the suite would be. See step 6 below.}
\item The suite is executed.
-\item The context object's \method{__exit__()} method is invoked. If an
-exception caused the suite to be exited, its type, value, and
+\item The context manager's \method{__exit__()} method is invoked. If
+an exception caused the suite to be exited, its type, value, and
traceback are passed as arguments to \method{__exit__()}. Otherwise,
three \constant{None} arguments are supplied.