summaryrefslogtreecommitdiffstats
path: root/Doc/ref
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2006-05-03 02:04:40 (GMT)
committerFred Drake <fdrake@acm.org>2006-05-03 02:04:40 (GMT)
commitf25fa6ddb97979abe06fec961c22d8db0b6563a1 (patch)
tree8a615a1de9bebe4a04c8f7f8ff3098305dc1f744 /Doc/ref
parentf863609cd64fef0fa0a36bd464096763c943f07e (diff)
downloadcpython-f25fa6ddb97979abe06fec961c22d8db0b6563a1.zip
cpython-f25fa6ddb97979abe06fec961c22d8db0b6563a1.tar.gz
cpython-f25fa6ddb97979abe06fec961c22d8db0b6563a1.tar.bz2
avoid ugly markup based on the unfortunate conversions of ">>" and "<<" to
guillemets; no need for magic here
Diffstat (limited to 'Doc/ref')
-rw-r--r--Doc/ref/ref3.tex10
-rw-r--r--Doc/ref/ref5.tex2
-rw-r--r--Doc/ref/ref6.tex2
3 files changed, 7 insertions, 7 deletions
diff --git a/Doc/ref/ref3.tex b/Doc/ref/ref3.tex
index ba0594f..a756e30 100644
--- a/Doc/ref/ref3.tex
+++ b/Doc/ref/ref3.tex
@@ -1875,8 +1875,8 @@ These methods are
called to implement the binary arithmetic operations (\code{+},
\code{-}, \code{*}, \code{//}, \code{\%},
\function{divmod()}\bifuncindex{divmod},
-\function{pow()}\bifuncindex{pow}, \code{**}, \code{<}\code{<},
-\code{>}\code{>}, \code{\&}, \code{\^}, \code{|}). For instance, to
+\function{pow()}\bifuncindex{pow}, \code{**}, \code{<<},
+\code{>>}, \code{\&}, \code{\^}, \code{|}). For instance, to
evaluate the expression \var{x}\code{+}\var{y}, where \var{x} is an
instance of a class that has an \method{__add__()} method,
\code{\var{x}.__add__(\var{y})} is called. The \method{__divmod__()}
@@ -1915,8 +1915,8 @@ These methods are
called to implement the binary arithmetic operations (\code{+},
\code{-}, \code{*}, \code{/}, \code{\%},
\function{divmod()}\bifuncindex{divmod},
-\function{pow()}\bifuncindex{pow}, \code{**}, \code{<}\code{<},
-\code{>}\code{>}, \code{\&}, \code{\^}, \code{|}) with reflected
+\function{pow()}\bifuncindex{pow}, \code{**}, \code{<<},
+\code{>>}, \code{\&}, \code{\^}, \code{|}) with reflected
(swapped) operands. These functions are only called if the left
operand does not support the corresponding operation. For instance,
to evaluate the expression \var{x}\code{-}\var{y}, where \var{y} is an
@@ -1942,7 +1942,7 @@ complicated).
\methodline[numeric object]{__ior__}{self, other}
These methods are called to implement the augmented arithmetic
operations (\code{+=}, \code{-=}, \code{*=}, \code{/=}, \code{\%=},
-\code{**=}, \code{<}\code{<=}, \code{>}\code{>=}, \code{\&=},
+\code{**=}, \code{<<=}, \code{>>=}, \code{\&=},
\code{\textasciicircum=}, \code{|=}). These methods should attempt to do the
operation in-place (modifying \var{self}) and return the result (which
could be, but does not have to be, \var{self}). If a specific method
diff --git a/Doc/ref/ref5.tex b/Doc/ref/ref5.tex
index 1f2dc5e..eca2f11 100644
--- a/Doc/ref/ref5.tex
+++ b/Doc/ref/ref5.tex
@@ -1158,7 +1158,7 @@ have the same precedence and chain from left to right --- see section
\hline
\lineii{\code{\&}} {Bitwise AND}
\hline
- \lineii{\code{<}\code{<}, \code{>}\code{>}} {Shifts}
+ \lineii{\code{<<}, \code{>>}} {Shifts}
\hline
\lineii{\code{+}, \code{-}}{Addition and subtraction}
\hline
diff --git a/Doc/ref/ref6.tex b/Doc/ref/ref6.tex
index 1eb1258..e820867 100644
--- a/Doc/ref/ref6.tex
+++ b/Doc/ref/ref6.tex
@@ -377,7 +377,7 @@ right type (but even this is determined by the sliced object).
\begin{productionlist}
\production{print_stmt}
{"print" ( \optional{\token{expression} ("," \token{expression})* \optional{","}}}
- \productioncont{| ">\code{>}" \token{expression}
+ \productioncont{| ">>" \token{expression}
\optional{("," \token{expression})+ \optional{","}} )}
\end{productionlist}