summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-09-06 07:06:08 (GMT)
committerGeorg Brandl <georg@python.org>2006-09-06 07:06:08 (GMT)
commit52318d6215f9f9626d38a9b81b52d411dbbdb36a (patch)
tree72563f6321f9265fb9d77702ee729e68048bdd07 /Doc
parent7cae87ca7b0a3a7ce497cbd335c8ec82fe680476 (diff)
downloadcpython-52318d6215f9f9626d38a9b81b52d411dbbdb36a.zip
cpython-52318d6215f9f9626d38a9b81b52d411dbbdb36a.tar.gz
cpython-52318d6215f9f9626d38a9b81b52d411dbbdb36a.tar.bz2
Patch #1550786: ellipsis literal.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/lib/libconsts.tex4
-rw-r--r--Doc/lib/libstdtypes.tex4
-rw-r--r--Doc/ref/ref3.tex5
-rw-r--r--Doc/ref/ref5.tex3
4 files changed, 8 insertions, 8 deletions
diff --git a/Doc/lib/libconsts.tex b/Doc/lib/libconsts.tex
index a7b4498..1f56b05 100644
--- a/Doc/lib/libconsts.tex
+++ b/Doc/lib/libconsts.tex
@@ -26,6 +26,8 @@ A small number of constants live in the built-in namespace. They are:
\end{datadesc}
\begin{datadesc}{Ellipsis}
- Special value used in conjunction with extended slicing syntax.
+ The same as \code{...}.
+ Special value used mostly in conjunction with extended slicing syntax
+ for user-defined container data types.
% XXX Someone who understands extended slicing should fill in here.
\end{datadesc}
diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index ef1b802..d5409e0 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -2004,12 +2004,12 @@ It is written as \code{None}.
\subsection{The Ellipsis Object \label{bltin-ellipsis-object}}
-This object is used by extended slice notation (see the
+This object is mostly used by extended slice notation (see the
\citetitle[../ref/ref.html]{Python Reference Manual}). It supports no
special operations. There is exactly one ellipsis object, named
\constant{Ellipsis} (a built-in name).
-It is written as \code{Ellipsis}.
+It is written as \code{Ellipsis} or \code{...}.
\subsection{Boolean Values}
diff --git a/Doc/ref/ref3.tex b/Doc/ref/ref3.tex
index 362d769..83277f4 100644
--- a/Doc/ref/ref3.tex
+++ b/Doc/ref/ref3.tex
@@ -148,9 +148,8 @@ fallback, depending on the operator.) Its truth value is true.
\item[Ellipsis]
This type has a single value. There is a single object with this value.
-This object is accessed through the built-in name \code{Ellipsis}.
-It is used to indicate the presence of the \samp{...} syntax in a
-slice. Its truth value is true.
+This object is accessed through the literal \code{...} or the
+built-in name \code{Ellipsis}. Its truth value is true.
\obindex{Ellipsis}
\item[Numbers]
diff --git a/Doc/ref/ref5.tex b/Doc/ref/ref5.tex
index 34a827c..6aa6de1 100644
--- a/Doc/ref/ref5.tex
+++ b/Doc/ref/ref5.tex
@@ -411,8 +411,7 @@ is constructed from the slice list, as follows. If the slice list
contains at least one comma, the key is a tuple containing the
conversion of the slice items; otherwise, the conversion of the lone
slice item is the key. The conversion of a slice item that is an
-expression is that expression. The conversion of an ellipsis slice
-item is the built-in \code{Ellipsis} object. The conversion of a
+expression is that expression. The conversion of a
proper slice is a slice object (see section \ref{types}) whose
\member{start}, \member{stop} and \member{step} attributes are the
values of the expressions given as lower bound, upper bound and