Commit 4ba3d657 authored by Guido van Rossum's avatar Guido van Rossum

Use != instead of <>. Sorry, Barry.

parent 48a680c0
...@@ -153,7 +153,7 @@ class SMTPChannel(asynchat.async_chat): ...@@ -153,7 +153,7 @@ class SMTPChannel(asynchat.async_chat):
method(arg) method(arg)
return return
else: else:
if self.__state <> self.DATA: if self.__state != self.DATA:
self.push('451 Internal confusion') self.push('451 Internal confusion')
return return
# Remove extraneous carriage returns and de-transparency according # Remove extraneous carriage returns and de-transparency according
...@@ -206,7 +206,7 @@ class SMTPChannel(asynchat.async_chat): ...@@ -206,7 +206,7 @@ class SMTPChannel(asynchat.async_chat):
keylen = len(keyword) keylen = len(keyword)
if arg[:keylen].upper() == keyword: if arg[:keylen].upper() == keyword:
address = arg[keylen:].strip() address = arg[keylen:].strip()
if address[0] == '<' and address[-1] == '>' and address <> '<>': if address[0] == '<' and address[-1] == '>' and address != '<>':
# Addresses can be in the form <person@dom.com> but watch out # Addresses can be in the form <person@dom.com> but watch out
# for null address, e.g. <> # for null address, e.g. <>
address = address[1:-1] address = address[1:-1]
...@@ -518,7 +518,7 @@ if __name__ == '__main__': ...@@ -518,7 +518,7 @@ if __name__ == '__main__':
try: try:
os.setuid(nobody) os.setuid(nobody)
except OSError, e: except OSError, e:
if e.errno <> errno.EPERM: raise if e.errno != errno.EPERM: raise
print >> sys.stderr, \ print >> sys.stderr, \
'Cannot setuid "nobody"; try running with -n option.' 'Cannot setuid "nobody"; try running with -n option.'
sys.exit(1) sys.exit(1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment