Whitespace normalization.
This commit is contained in:
parent
3c61c3525f
commit
658cba6706
|
@ -1,5 +1,5 @@
|
||||||
# -*- Mode: Python; tab-width: 4 -*-
|
# -*- Mode: Python; tab-width: 4 -*-
|
||||||
# Id: asynchat.py,v 2.26 2000/09/07 22:29:26 rushing Exp
|
# Id: asynchat.py,v 2.26 2000/09/07 22:29:26 rushing Exp
|
||||||
# Author: Sam Rushing <rushing@nightmare.com>
|
# Author: Sam Rushing <rushing@nightmare.com>
|
||||||
|
|
||||||
# ======================================================================
|
# ======================================================================
|
||||||
|
|
|
@ -323,7 +323,7 @@ class Pickler:
|
||||||
else:
|
else:
|
||||||
self.write(BINSTRING + s + object)
|
self.write(BINSTRING + s + object)
|
||||||
else:
|
else:
|
||||||
if unicode:
|
if unicode:
|
||||||
object = object.replace(u"\\", u"\\u005c")
|
object = object.replace(u"\\", u"\\u005c")
|
||||||
object = object.replace(u"\n", u"\\u000a")
|
object = object.replace(u"\n", u"\\u000a")
|
||||||
object = object.encode('raw-unicode-escape')
|
object = object.encode('raw-unicode-escape')
|
||||||
|
@ -335,7 +335,7 @@ class Pickler:
|
||||||
self.write(self.put(memo_len))
|
self.write(self.put(memo_len))
|
||||||
memo[d] = (memo_len, object)
|
memo[d] = (memo_len, object)
|
||||||
dispatch[StringType] = save_string
|
dispatch[StringType] = save_string
|
||||||
|
|
||||||
def save_tuple(self, object):
|
def save_tuple(self, object):
|
||||||
|
|
||||||
write = self.write
|
write = self.write
|
||||||
|
|
|
@ -158,7 +158,7 @@ else:
|
||||||
return inst.fromchild, inst.tochild
|
return inst.fromchild, inst.tochild
|
||||||
|
|
||||||
__all__.extend(["Popen3", "Popen4"])
|
__all__.extend(["Popen3", "Popen4"])
|
||||||
|
|
||||||
def _test():
|
def _test():
|
||||||
cmd = "cat"
|
cmd = "cat"
|
||||||
teststr = "ab cd\n"
|
teststr = "ab cd\n"
|
||||||
|
|
|
@ -346,7 +346,7 @@ def normpath(path):
|
||||||
initial_slashes = path.startswith('/')
|
initial_slashes = path.startswith('/')
|
||||||
# POSIX allows one or two initial slashes, but treats three or more
|
# POSIX allows one or two initial slashes, but treats three or more
|
||||||
# as single slash.
|
# as single slash.
|
||||||
if (initial_slashes and
|
if (initial_slashes and
|
||||||
path.startswith('//') and not path.startswith('///')):
|
path.startswith('//') and not path.startswith('///')):
|
||||||
initial_slashes = 2
|
initial_slashes = 2
|
||||||
comps = path.split('/')
|
comps = path.split('/')
|
||||||
|
|
|
@ -334,4 +334,3 @@ def readmodule_ex(module, path=[], inpackage=0):
|
||||||
|
|
||||||
def _indent(ws, _expandtabs=string.expandtabs):
|
def _indent(ws, _expandtabs=string.expandtabs):
|
||||||
return len(_expandtabs(ws, TABWIDTH))
|
return len(_expandtabs(ws, TABWIDTH))
|
||||||
|
|
||||||
|
|
18
Lib/smtpd.py
18
Lib/smtpd.py
|
@ -90,7 +90,7 @@ NEWLINE = '\n'
|
||||||
EMPTYSTRING = ''
|
EMPTYSTRING = ''
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def usage(code, msg=''):
|
def usage(code, msg=''):
|
||||||
print >> sys.stderr, __doc__ % globals()
|
print >> sys.stderr, __doc__ % globals()
|
||||||
if msg:
|
if msg:
|
||||||
|
@ -98,7 +98,7 @@ def usage(code, msg=''):
|
||||||
sys.exit(code)
|
sys.exit(code)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class SMTPChannel(asynchat.async_chat):
|
class SMTPChannel(asynchat.async_chat):
|
||||||
COMMAND = 0
|
COMMAND = 0
|
||||||
DATA = 1
|
DATA = 1
|
||||||
|
@ -263,7 +263,7 @@ class SMTPChannel(asynchat.async_chat):
|
||||||
self.push('354 End data with <CR><LF>.<CR><LF>')
|
self.push('354 End data with <CR><LF>.<CR><LF>')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class SMTPServer(asyncore.dispatcher):
|
class SMTPServer(asyncore.dispatcher):
|
||||||
def __init__(self, localaddr, remoteaddr):
|
def __init__(self, localaddr, remoteaddr):
|
||||||
self._localaddr = localaddr
|
self._localaddr = localaddr
|
||||||
|
@ -310,7 +310,7 @@ class SMTPServer(asyncore.dispatcher):
|
||||||
"""
|
"""
|
||||||
raise UnimplementedError
|
raise UnimplementedError
|
||||||
|
|
||||||
|
|
||||||
class DebuggingServer(SMTPServer):
|
class DebuggingServer(SMTPServer):
|
||||||
# Do something with the gathered message
|
# Do something with the gathered message
|
||||||
def process_message(self, peer, mailfrom, rcpttos, data):
|
def process_message(self, peer, mailfrom, rcpttos, data):
|
||||||
|
@ -326,7 +326,7 @@ class DebuggingServer(SMTPServer):
|
||||||
print '------------ END MESSAGE ------------'
|
print '------------ END MESSAGE ------------'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class PureProxy(SMTPServer):
|
class PureProxy(SMTPServer):
|
||||||
def process_message(self, peer, mailfrom, rcpttos, data):
|
def process_message(self, peer, mailfrom, rcpttos, data):
|
||||||
lines = data.split('\n')
|
lines = data.split('\n')
|
||||||
|
@ -367,7 +367,7 @@ class PureProxy(SMTPServer):
|
||||||
return refused
|
return refused
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class MailmanProxy(PureProxy):
|
class MailmanProxy(PureProxy):
|
||||||
def process_message(self, peer, mailfrom, rcpttos, data):
|
def process_message(self, peer, mailfrom, rcpttos, data):
|
||||||
from cStringIO import StringIO
|
from cStringIO import StringIO
|
||||||
|
@ -405,7 +405,7 @@ class MailmanProxy(PureProxy):
|
||||||
# since we don't expect a large number of recipients.
|
# since we don't expect a large number of recipients.
|
||||||
for rcpt, listname, command in listnames:
|
for rcpt, listname, command in listnames:
|
||||||
rcpttos.remove(rcpt)
|
rcpttos.remove(rcpt)
|
||||||
# If there's any non-list destined recipients left,
|
# If there's any non-list destined recipients left,
|
||||||
print >> DEBUGSTREAM, 'forwarding recips:', ' '.join(rcpttos)
|
print >> DEBUGSTREAM, 'forwarding recips:', ' '.join(rcpttos)
|
||||||
if rcpttos:
|
if rcpttos:
|
||||||
refused = self._deliver(mailfrom, rcpttos, data)
|
refused = self._deliver(mailfrom, rcpttos, data)
|
||||||
|
@ -447,7 +447,7 @@ class MailmanProxy(PureProxy):
|
||||||
msg.Enqueue(mlist, torequest=1)
|
msg.Enqueue(mlist, torequest=1)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Options:
|
class Options:
|
||||||
setuid = 1
|
setuid = 1
|
||||||
classname = 'PureProxy'
|
classname = 'PureProxy'
|
||||||
|
@ -502,7 +502,7 @@ def parseargs():
|
||||||
return options
|
return options
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
options = parseargs()
|
options = parseargs()
|
||||||
# Become nobody
|
# Become nobody
|
||||||
|
|
|
@ -1103,7 +1103,7 @@ def urlencode(query,doseq=0):
|
||||||
parameters in the output will match the order of parameters in the
|
parameters in the output will match the order of parameters in the
|
||||||
input.
|
input.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if hasattr(query,"items"):
|
if hasattr(query,"items"):
|
||||||
# mapping objects
|
# mapping objects
|
||||||
query = query.items()
|
query = query.items()
|
||||||
|
|
|
@ -6,8 +6,8 @@ import sys
|
||||||
class Error(Exception):
|
class Error(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
_browsers = {} # Dictionary of available browser controllers
|
_browsers = {} # Dictionary of available browser controllers
|
||||||
_tryorder = [] # Preference order of available browsers
|
_tryorder = [] # Preference order of available browsers
|
||||||
|
|
||||||
def register(name, klass, instance=None):
|
def register(name, klass, instance=None):
|
||||||
"""Register a browser connector and, optionally, connection."""
|
"""Register a browser connector and, optionally, connection."""
|
||||||
|
@ -24,7 +24,7 @@ def get(using=None):
|
||||||
# User gave us a command line, don't mess with it.
|
# User gave us a command line, don't mess with it.
|
||||||
return browser
|
return browser
|
||||||
else:
|
else:
|
||||||
# User gave us a browser name.
|
# User gave us a browser name.
|
||||||
command = _browsers[browser.lower()]
|
command = _browsers[browser.lower()]
|
||||||
if command[1] is None:
|
if command[1] is None:
|
||||||
return command[0]()
|
return command[0]()
|
||||||
|
@ -37,7 +37,7 @@ def get(using=None):
|
||||||
def open(url, new=0, autoraise=1):
|
def open(url, new=0, autoraise=1):
|
||||||
get().open(url, new, autoraise)
|
get().open(url, new, autoraise)
|
||||||
|
|
||||||
def open_new(url): # Marked deprecated. May be removed in 2.1.
|
def open_new(url): # Marked deprecated. May be removed in 2.1.
|
||||||
get().open(url, 1)
|
get().open(url, 1)
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -47,7 +47,7 @@ def open_new(url): # Marked deprecated. May be removed in 2.1.
|
||||||
# support the user's platform.
|
# support the user's platform.
|
||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# Platform support for Unix
|
# Platform support for Unix
|
||||||
#
|
#
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
|
||||||
def open(self, url, new=0, autoraise=1):
|
def open(self, url, new=0, autoraise=1):
|
||||||
os.system(self.command % url)
|
os.system(self.command % url)
|
||||||
|
|
||||||
def open_new(self, url): # Deprecated. May be removed in 2.1.
|
def open_new(self, url): # Deprecated. May be removed in 2.1.
|
||||||
self.open(url)
|
self.open(url)
|
||||||
|
|
||||||
# Easy cases first -- register console browsers if we have them.
|
# Easy cases first -- register console browsers if we have them.
|
||||||
|
|
Loading…
Reference in New Issue