summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-02-27 16:31:12 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-02-27 16:31:12 (GMT)
commitf9f61b4aa281c1b19546dba7f1ee529b8b80bc9a (patch)
tree46ffbc796b0ba75148b8d63a5ecc82a669050eb0
parente2dd78c76095175f15f44f48b15763853244b683 (diff)
downloadcpython-f9f61b4aa281c1b19546dba7f1ee529b8b80bc9a.zip
cpython-f9f61b4aa281c1b19546dba7f1ee529b8b80bc9a.tar.gz
cpython-f9f61b4aa281c1b19546dba7f1ee529b8b80bc9a.tar.bz2
Note version added for conditional expressions
-rw-r--r--Doc/ref/ref5.tex2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/ref/ref5.tex b/Doc/ref/ref5.tex
index 65a3cff..1f2dc5e 100644
--- a/Doc/ref/ref5.tex
+++ b/Doc/ref/ref5.tex
@@ -1039,7 +1039,7 @@ The operator \keyword{not} yields \code{True} if its argument is false,
The expression \code{\var{x} if \var{C} else \var{y}} first evaluates
\var{C} (\emph{not} \var{x}); if \var{C} is true, \var{x} is evaluated and
its value is returned; otherwise, \var{y} is evaluated and its value is
-returned.
+returned. \versionadded{2.5}
The expression \code{\var{x} and \var{y}} first evaluates \var{x}; if
\var{x} is false, its value is returned; otherwise, \var{y} is