From 280488b9a3b5cc213d01aae794751b89144f8609 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Fri, 23 Aug 2002 18:19:30 +0000 Subject: Whitespace normalization. --- Lib/dis.py | 2 +- Lib/email/Charset.py | 2 +- Lib/email/Message.py | 6 +++--- Lib/email/Parser.py | 10 +++++----- Lib/encodings/string_escape.py | 2 +- Lib/pdb.py | 2 +- Tools/idle/CallTips.py | 2 +- Tools/idle/IOBinding.py | 2 +- Tools/idle/ScriptBinding.py | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Lib/dis.py b/Lib/dis.py index a1cc215..4257729 100644 --- a/Lib/dis.py +++ b/Lib/dis.py @@ -68,7 +68,7 @@ def disassemble(co, lasti=-1): table_index += 1 addr = 0 line_incr = 0 - + labels = findlabels(code) n = len(code) i = 0 diff --git a/Lib/email/Charset.py b/Lib/email/Charset.py index 9a54dab..c0fe9d7 100644 --- a/Lib/email/Charset.py +++ b/Lib/email/Charset.py @@ -11,7 +11,7 @@ else: from types import UnicodeType def _is_unicode(x): return isinstance(x, UnicodeType) - + from email.Encoders import encode_7or8bit import email.base64MIME import email.quopriMIME diff --git a/Lib/email/Message.py b/Lib/email/Message.py index 40e4785..8b4f8bd 100644 --- a/Lib/email/Message.py +++ b/Lib/email/Message.py @@ -52,12 +52,12 @@ def _formatparam(param, value=None, quote=1): def _unquotevalue(value): if isinstance(value, TupleType): - return (value[0], value[1], Utils.unquote(value[2])) + return (value[0], value[1], Utils.unquote(value[2])) else: - return Utils.unquote(value) + return Utils.unquote(value) - + class Message: """Basic message object for use inside the object tree. diff --git a/Lib/email/Parser.py b/Lib/email/Parser.py index b9d3ed3..a2ac576 100644 --- a/Lib/email/Parser.py +++ b/Lib/email/Parser.py @@ -129,7 +129,7 @@ class Parser: # boundary. separator = '--' + boundary payload = fp.read() - # We use an RE here because boundaries can have trailing + # We use an RE here because boundaries can have trailing # whitespace. mo = re.search( r'(?P' + re.escape(separator) + r')(?P[ \t]*)', @@ -176,15 +176,15 @@ class Parser: terminator = len(payload) # We split the textual payload on the boundary separator, which # includes the trailing newline. If the container is a - # multipart/digest then the subparts are by default message/rfc822 - # instead of text/plain. In that case, they'll have a optional - # block of MIME headers, then an empty line followed by the + # multipart/digest then the subparts are by default message/rfc822 + # instead of text/plain. In that case, they'll have a optional + # block of MIME headers, then an empty line followed by the # message headers. parts = re.split( linesep + re.escape(separator) + r'[ \t]*' + linesep, payload[start:terminator]) for part in parts: - if isdigest: + if isdigest: if part[0] == linesep: # There's no header block so create an empty message # object as the container, and lop off the newline so diff --git a/Lib/encodings/string_escape.py b/Lib/encodings/string_escape.py index 0e9a17f..c02bfee 100644 --- a/Lib/encodings/string_escape.py +++ b/Lib/encodings/string_escape.py @@ -14,7 +14,7 @@ class Codec(codecs.Codec): class StreamWriter(Codec,codecs.StreamWriter): pass - + class StreamReader(Codec,codecs.StreamReader): pass diff --git a/Lib/pdb.py b/Lib/pdb.py index c6164ad..2a8a9e3 100755 --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -105,7 +105,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): if len(line) > 0 and line[0] != '#': self.onecmd(line) - # Override Bdb methods + # Override Bdb methods def user_call(self, frame, argument_list): """This method is called when there is the remote possibility diff --git a/Tools/idle/CallTips.py b/Tools/idle/CallTips.py index 412a2e6..dc25083 100644 --- a/Tools/idle/CallTips.py +++ b/Tools/idle/CallTips.py @@ -79,7 +79,7 @@ class CallTips: wordchars="._" + string.ascii_letters + string.digits): # Usage of ascii_letters is necessary to avoid UnicodeErrors # if chars contains non-ASCII. - + # XXX - This needs to be moved to a better place # so the "." attribute lookup code can also use it. text = self.text diff --git a/Tools/idle/IOBinding.py b/Tools/idle/IOBinding.py index d80e53c..fd8aaf6 100644 --- a/Tools/idle/IOBinding.py +++ b/Tools/idle/IOBinding.py @@ -209,7 +209,7 @@ class IOBinding: "installation. The file may not display correctly" % name, master = self.text) enc = None - + if enc: try: return unicode(chars, enc) diff --git a/Tools/idle/ScriptBinding.py b/Tools/idle/ScriptBinding.py index 19a20b2..3e1279c 100644 --- a/Tools/idle/ScriptBinding.py +++ b/Tools/idle/ScriptBinding.py @@ -53,7 +53,7 @@ class ScriptBinding: def __init__(self, editwin): if not editwin.runnable: self.menudefs = [] - self.keydefs = {} + self.keydefs = {} self.editwin = editwin # Provide instance variables referenced by Debugger # XXX This should be done differently -- cgit v0.12