traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of most of the remaining uses of <>. There's still Tools/* thogh.

This commit is contained in:
Neal Norwitz 2006-08-29 04:39:12 +00:00
parent c4996ba794
commit 3bd844e695
16 changed files with 23 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Demo/rpc/nfsclient.py
View File

@ -163,7 +163,7 @@ class NFSClient(UDPClient):
ra = (dir, 0, 2000)
while 1:
(status, rest) = self.Readdir(ra)
if status <> NFS_OK:
if status != NFS_OK:
break
entries, eof = rest
last_cookie = None

4
Demo/rpc/xdr.py
View File

@ -78,7 +78,7 @@ class Packer:
self.pack_uint(0)
def pack_farray(self, n, list, pack_item):
if len(list) <> n:
if len(list) != n:
raise ValueError, 'wrong array size'
for item in list:
pack_item(item)
@ -183,7 +183,7 @@ class Unpacker:
while 1:
x = self.unpack_uint()
if x == 0: break
if x <> 1:
if x != 1:
raise RuntimeError, '0 or 1 expected, got %r' % (x, )
item = unpack_item()
list.append(item)

4
Demo/scripts/lpwatch.py
View File

@ -74,7 +74,7 @@ def makestatus(name, thisuser):
ubytes = ubytes + bytes
users[user] = ujobs, ubytes
else:
if fields and fields[0] <> 'Rank':
if fields and fields[0] != 'Rank':
line = string.strip(line)
if line == 'no entries':
line = name + ': idle'
@ -84,7 +84,7 @@ def makestatus(name, thisuser):
#
if totaljobs:
line = '%d K' % ((totalbytes+1023)/1024)
if totaljobs <> len(users):
if totaljobs != len(users):
line = line + ' (%d jobs)' % totaljobs
if len(users) == 1:
line = line + ' for %s' % (users.keys()[0],)

2
Demo/scripts/primes.py
View File

@ -18,7 +18,7 @@ def primes(min, max):
while i <= max:
for p in primes:
if i%p == 0 or p*p > i: break
if i%p <> 0:
if i%p != 0:
primes.append(i)
if i >= min: print i
i = i+2

2
Demo/scripts/update.py
View File

@ -83,7 +83,7 @@ def main():
print 'Funny line:', line,
continue
filename, lineno = prog.group(1, 2)
if not curfile or filename <> curfile.filename:
if not curfile or filename != curfile.filename:
if curfile: curfile.finish()
curfile = FileObj(filename)
curfile.process(lineno, line[n:])

2
Demo/sockets/gopher.py
View File

@ -246,7 +246,7 @@ def browse_search(selector, host, port):
def browse_telnet(selector, host, port):
if selector:
print 'Log in as', repr(selector)
if type(port) <> type(''):
if type(port) != type(''):
port = repr(port)
sts = os.system('set -x; exec telnet ' + host + ' ' + port)
if sts:

6
Demo/tkinter/guido/ShellWindow.py
View File

@ -115,11 +115,11 @@ def spawn(prog, args):
os.close(i)
except os.error:
pass
if os.dup(p2cread) <> 0:
if os.dup(p2cread) != 0:
sys.stderr.write('popen2: bad read dup\n')
if os.dup(c2pwrite) <> 1:
if os.dup(c2pwrite) != 1:
sys.stderr.write('popen2: bad write dup\n')
if os.dup(c2pwrite) <> 2:
if os.dup(c2pwrite) != 2:
sys.stderr.write('popen2: bad write dup\n')
for i in range(3, MAXFD):
try:

2
Doc/lib/email-unpack.py
View File

@ -37,7 +37,7 @@ Usage: %prog [options] msgfile
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)

14
Doc/lib/libstdtypes.tex
View File

@ -126,8 +126,7 @@ This table summarizes the comparison operations:
\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 @@ This table summarizes the comparison operations:
\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).

4
Doc/lib/libstdwin.tex
View File

@ -123,8 +123,8 @@ Return the default foreground color for unknown color names.
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:

6
Doc/ref/ref2.tex
View File

@ -689,13 +689,9 @@ The following tokens are operators:
\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}}

3
Doc/ref/ref3.tex
View File

@ -1243,8 +1243,7 @@ follows:
\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

9
Doc/ref/ref5.tex
View File

@ -832,7 +832,7 @@ interpretation that is conventional in mathematics:
\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 @@ Note that \var{a opa b opb c} doesn't imply any kind of comparison
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 @@ have the same precedence and chain from left to right --- see section
\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}

8
Misc/cheatsheet
View File

@ -215,7 +215,6 @@ Highest Operator Comment
x^y Bitwise exclusive or
x|y Bitwise or
x<y x<=y x>y x>=y x==y x!=y Comparison,
x<>y identity,
x is y x is not y membership
x in s x not in s
not x boolean negation
@ -241,7 +240,7 @@ Comparison Meaning Notes
> strictly greater than
>= greater than or equal to
== equal to
!= or <> not equal to
!= not equal to
is object identity (2)
is not negated object identity (2)
@ -1009,9 +1008,8 @@ reload(module) after fixing it. If module was syntacticallycorrect but had
an error in initialization, mustimport it one more time
before calling reload().
Returns a string containing a printable and if possible
repr(object) evaluable representation of an object. <=> `object`
(usingbackquotes). Class redefinissable (__repr__). See
also str()
repr(object) evaluable representation of an object.
Class redefinable (__repr__). See also str().
round(x, n=0) Returns the floating point value x rounded to n digitsafter
the decimal point.
setattr(object, This is the counterpart of getattr().setattr(o, 'foobar',

2
Misc/python-mode.el
View File

@ -690,8 +690,6 @@ prospect as debugging continues.")
;; Both single quote and double quote are string delimiters
(modify-syntax-entry ?\' "\"" py-mode-syntax-table)
(modify-syntax-entry ?\" "\"" py-mode-syntax-table)
;; backquote is open and close paren
(modify-syntax-entry ?\` "$" py-mode-syntax-table)
;; comment delimiters
(modify-syntax-entry ?\# "<" py-mode-syntax-table)
(modify-syntax-entry ?\n ">" py-mode-syntax-table)

2
Objects/object.c
View File

@ -591,7 +591,7 @@ do_compare(PyObject *v, PyObject *w)
/* Give up */
PyErr_Format(PyExc_TypeError,
"unorderable types: '%.100s' <> '%.100s'",
"unorderable types: '%.100s' != '%.100s'",
v->ob_type->tp_name,
w->ob_type->tp_name);
return -1;