mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Use != instead of <>. Sorry, Barry.
This commit is contained in:
parent
48a680c097
commit
4ba3d657ef
1 changed files with 3 additions and 3 deletions
|
@ -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):
|
||||||
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__':
|
||||||
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)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue