Get rid of most of the remaining uses of <>. There's still Tools/* thogh.
diff --git a/Doc/lib/email-unpack.py b/Doc/lib/email-unpack.py
index fc05d99..fb03e58 100644
--- a/Doc/lib/email-unpack.py
+++ b/Doc/lib/email-unpack.py
@@ -37,7 +37,7 @@
os.mkdir(opts.directory)
except OSError, e:
# Ignore directory exists error
- if e.errno <> errno.EEXIST:
+ if e.errno != errno.EEXIST:
raise
fp = open(msgfile)
diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index 95b06f8..e1993aa 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -126,8 +126,7 @@
\lineiii{>}{strictly greater than}{}
\lineiii{>=}{greater than or equal}{}
\lineiii{==}{equal}{}
- \lineiii{!=}{not equal}{(1)}
- \lineiii{<>}{not equal}{(1)}
+ \lineiii{!=}{not equal}
\lineiii{is}{object identity}{}
\lineiii{is not}{negated object identity}{}
\end{tableiii}
@@ -136,17 +135,6 @@
\opindex{is}
\opindex{is not}
-\noindent
-Notes:
-
-\begin{description}
-
-\item[(1)]
-\code{<>} and \code{!=} are alternate spellings for the same operator.
-\code{!=} is the preferred spelling; \code{<>} is obsolescent.
-
-\end{description}
-
Objects of different types, except different numeric types and different string types, never
compare equal; such objects are ordered consistently but arbitrarily
(so that sorting a heterogeneous array yields a consistent result).
diff --git a/Doc/lib/libstdwin.tex b/Doc/lib/libstdwin.tex
index 84aad2f..f2278e5 100644
--- a/Doc/lib/libstdwin.tex
+++ b/Doc/lib/libstdwin.tex
@@ -123,8 +123,8 @@
Hint: the following code tests whether you are on a machine that
supports more than two colors:
\begin{verbatim}
-if stdwin.fetchcolor('black') <> \
- stdwin.fetchcolor('red') <> \
+if stdwin.fetchcolor('black') != \
+ stdwin.fetchcolor('red') != \
stdwin.fetchcolor('white'):
print 'color machine'
else:
diff --git a/Doc/ref/ref2.tex b/Doc/ref/ref2.tex
index bad4609..f82d9ce 100644
--- a/Doc/ref/ref2.tex
+++ b/Doc/ref/ref2.tex
@@ -689,13 +689,9 @@
\begin{verbatim}
+ - * ** / // %
<< >> & | ^ ~
-< > <= >= == != <>
+< > <= >= == !=
\end{verbatim}
-The comparison operators \code{<>} and \code{!=} are alternate
-spellings of the same operator. \code{!=} is the preferred spelling;
-\code{<>} is obsolescent.
-
\section{Delimiters\label{delimiters}}
diff --git a/Doc/ref/ref3.tex b/Doc/ref/ref3.tex
index f53dbe3..362d769 100644
--- a/Doc/ref/ref3.tex
+++ b/Doc/ref/ref3.tex
@@ -1243,8 +1243,7 @@
\code{\var{x}<\var{y}} calls \code{\var{x}.__lt__(\var{y})},
\code{\var{x}<=\var{y}} calls \code{\var{x}.__le__(\var{y})},
\code{\var{x}==\var{y}} calls \code{\var{x}.__eq__(\var{y})},
-\code{\var{x}!=\var{y}} and \code{\var{x}<>\var{y}} call
-\code{\var{x}.__ne__(\var{y})},
+\code{\var{x}!=\var{y}} calls \code{\var{x}.__ne__(\var{y})},
\code{\var{x}>\var{y}} calls \code{\var{x}.__gt__(\var{y})}, and
\code{\var{x}>=\var{y}} calls \code{\var{x}.__ge__(\var{y})}.
These methods can return any value, but if the comparison operator is
diff --git a/Doc/ref/ref5.tex b/Doc/ref/ref5.tex
index 52bb57f..34a827c 100644
--- a/Doc/ref/ref5.tex
+++ b/Doc/ref/ref5.tex
@@ -832,7 +832,7 @@
\production{comparison}
{\token{or_expr} ( \token{comp_operator} \token{or_expr} )*}
\production{comp_operator}
- {"<" | ">" | "==" | ">=" | "<=" | "<>" | "!="}
+ {"<" | ">" | "==" | ">=" | "<=" | "!="}
\productioncont{| "is" ["not"] | ["not"] "in"}
\end{productionlist}
@@ -854,11 +854,6 @@
between \var{a} and \var{c}, so that, e.g., \code{x < y > z} is
perfectly legal (though perhaps not pretty).
-The forms \code{<>} and \code{!=} are equivalent; for consistency with
-C, \code{!=} is preferred; where \code{!=} is mentioned below
-\code{<>} is also accepted. The \code{<>} spelling is considered
-obsolescent.
-
The operators \code{<}, \code{>}, \code{==}, \code{>=}, \code{<=}, and
\code{!=} compare
the values of two objects. The objects need not have the same type.
@@ -1111,7 +1106,7 @@
\lineii{\keyword{in}, \keyword{not} \keyword{in}}{Membership tests}
\lineii{\keyword{is}, \keyword{is not}}{Identity tests}
\lineii{\code{<}, \code{<=}, \code{>}, \code{>=},
- \code{<>}, \code{!=}, \code{==}}
+ \code{!=}, \code{==}}
{Comparisons}
\hline
\lineii{\code{|}} {Bitwise OR}