diff options
| -rw-r--r-- | Lib/asynchat.py | 2 | ||||
| -rw-r--r-- | Lib/pickle.py | 4 | ||||
| -rw-r--r-- | Lib/popen2.py | 2 | ||||
| -rw-r--r-- | Lib/posixpath.py | 2 | ||||
| -rw-r--r-- | Lib/pyclbr.py | 1 | ||||
| -rwxr-xr-x | Lib/smtpd.py | 18 | ||||
| -rw-r--r-- | Lib/urllib.py | 2 | ||||
| -rw-r--r-- | Lib/webbrowser.py | 12 |
8 files changed, 21 insertions, 22 deletions
diff --git a/Lib/asynchat.py b/Lib/asynchat.py index 88873d2..bcbfc01 100644 --- a/Lib/asynchat.py +++ b/Lib/asynchat.py @@ -1,5 +1,5 @@ # -*- 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> # ====================================================================== diff --git a/Lib/pickle.py b/Lib/pickle.py index b0c6a79..5606ee0 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -323,7 +323,7 @@ class Pickler: else: self.write(BINSTRING + s + object) else: - if unicode: + if unicode: object = object.replace(u"\\", u"\\u005c") object = object.replace(u"\n", u"\\u000a") object = object.encode('raw-unicode-escape') @@ -335,7 +335,7 @@ class Pickler: self.write(self.put(memo_len)) memo[d] = (memo_len, object) dispatch[StringType] = save_string - + def save_tuple(self, object): write = self.write diff --git a/Lib/popen2.py b/Lib/popen2.py index 954eb29..8b1af76 100644 --- a/Lib/popen2.py +++ b/Lib/popen2.py @@ -158,7 +158,7 @@ else: return inst.fromchild, inst.tochild __all__.extend(["Popen3", "Popen4"]) - + def _test(): cmd = "cat" teststr = "ab cd\n" diff --git a/Lib/posixpath.py b/Lib/posixpath.py index 31b3315..2d18f5d 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -346,7 +346,7 @@ def normpath(path): initial_slashes = path.startswith('/') # POSIX allows one or two initial slashes, but treats three or more # as single slash. - if (initial_slashes and + if (initial_slashes and path.startswith('//') and not path.startswith('///')): initial_slashes = 2 comps = path.split('/') diff --git a/Lib/pyclbr.py b/Lib/pyclbr.py index 305cabb..b4e934b 100644 --- a/Lib/pyclbr.py +++ b/Lib/pyclbr.py @@ -334,4 +334,3 @@ def readmodule_ex(module, path=[], inpackage=0): def _indent(ws, _expandtabs=string.expandtabs): return len(_expandtabs(ws, TABWIDTH)) - diff --git a/Lib/smtpd.py b/Lib/smtpd.py index 21c0114..3d94b97 100755 --- a/Lib/smtpd.py +++ b/Lib/smtpd.py @@ -90,7 +90,7 @@ NEWLINE = '\n' EMPTYSTRING = '' - + def usage(code, msg=''): print >> sys.stderr, __doc__ % globals() if msg: @@ -98,7 +98,7 @@ def usage(code, msg=''): sys.exit(code) - + class SMTPChannel(asynchat.async_chat): COMMAND = 0 DATA = 1 @@ -263,7 +263,7 @@ class SMTPChannel(asynchat.async_chat): self.push('354 End data with <CR><LF>.<CR><LF>') - + class SMTPServer(asyncore.dispatcher): def __init__(self, localaddr, remoteaddr): self._localaddr = localaddr @@ -310,7 +310,7 @@ class SMTPServer(asyncore.dispatcher): """ raise UnimplementedError - + class DebuggingServer(SMTPServer): # Do something with the gathered message def process_message(self, peer, mailfrom, rcpttos, data): @@ -326,7 +326,7 @@ class DebuggingServer(SMTPServer): print '------------ END MESSAGE ------------' - + class PureProxy(SMTPServer): def process_message(self, peer, mailfrom, rcpttos, data): lines = data.split('\n') @@ -367,7 +367,7 @@ class PureProxy(SMTPServer): return refused - + class MailmanProxy(PureProxy): def process_message(self, peer, mailfrom, rcpttos, data): from cStringIO import StringIO @@ -405,7 +405,7 @@ class MailmanProxy(PureProxy): # since we don't expect a large number of recipients. for rcpt, listname, command in listnames: 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) if rcpttos: refused = self._deliver(mailfrom, rcpttos, data) @@ -447,7 +447,7 @@ class MailmanProxy(PureProxy): msg.Enqueue(mlist, torequest=1) - + class Options: setuid = 1 classname = 'PureProxy' @@ -502,7 +502,7 @@ def parseargs(): return options - + if __name__ == '__main__': options = parseargs() # Become nobody diff --git a/Lib/urllib.py b/Lib/urllib.py index a410e71..c5d85fc 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1103,7 +1103,7 @@ def urlencode(query,doseq=0): parameters in the output will match the order of parameters in the input. """ - + if hasattr(query,"items"): # mapping objects query = query.items() diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index 0ad20d3..59825fa 100644 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -6,8 +6,8 @@ import sys class Error(Exception): pass -_browsers = {} # Dictionary of available browser controllers -_tryorder = [] # Preference order of available browsers +_browsers = {} # Dictionary of available browser controllers +_tryorder = [] # Preference order of available browsers def register(name, klass, instance=None): """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. return browser else: - # User gave us a browser name. + # User gave us a browser name. command = _browsers[browser.lower()] if command[1] is None: return command[0]() @@ -37,7 +37,7 @@ def get(using=None): def open(url, new=0, autoraise=1): 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) # @@ -47,7 +47,7 @@ def open_new(url): # Marked deprecated. May be removed in 2.1. # support the user's platform. # -# +# # 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): 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) # Easy cases first -- register console browsers if we have them. |