Whitespace normalization.

diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index ac87a511aabce8b2e790e0dec43260f41cd3219f..396dff7a53d0e1ac907f98bffde385bf32cae846 100755 (executable)
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -266,7 +266,7 @@ class Maildir(Mailbox):
             if e.errno == errno.ENOENT:
                 pass
             else:
-                raise 
+                raise
 
     def __setitem__(self, key, message):
         """Replace the keyed message; raise KeyError if it doesn't exist."""
@@ -1641,7 +1641,7 @@ class BabylMessage(Message):
             self._labels.remove(label)
         except ValueError:
             pass
-    
+
     def get_visible(self):
         """Return a Message representation of visible headers."""
         return Message(self._visible)
@@ -1840,7 +1840,7 @@ def _lock_file(f, dotlock=True):
             except OSError, e:
                 if e.errno == errno.EEXIST:
                     os.remove(pre_lock.name)
-                    raise ExternalClashError('dot lock unavailable: %s' % 
+                    raise ExternalClashError('dot lock unavailable: %s' %
                                              f.name)
                 else:
                     raise

diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index 83c2443dde1f96f8deea8bb11db00dbc15171dea..6044071d83ad7c53ec9ccee7819d37a994032f8b 100644 (file)
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -1380,7 +1380,7 @@ class TestMessageConversion(TestBase):
         msg.update_visible()
         for label in ('unseen', 'deleted', 'filed', 'answered', 'forwarded',
                       'edited', 'resent'):
-            msg.add_label(label)       
+            msg.add_label(label)
         msg2 = mailbox.BabylMessage(msg)
         self.assert_(msg2.get_labels() == ['unseen', 'deleted', 'filed',
                                            'answered', 'forwarded', 'edited',
@@ -1673,17 +1673,17 @@ Return-Path: <gkj@gregorykjohnson.com>
 X-Original-To: gkj+person@localhost
 Delivered-To: gkj+person@localhost
 Received: from localhost (localhost [127.0.0.1])
-       by andy.gregorykjohnson.com (Postfix) with ESMTP id 356ED9DD17
-       for <gkj+person@localhost>; Wed, 13 Jul 2005 17:23:16 -0400 (EDT)
+        by andy.gregorykjohnson.com (Postfix) with ESMTP id 356ED9DD17
+        for <gkj+person@localhost>; Wed, 13 Jul 2005 17:23:16 -0400 (EDT)
 Delivered-To: gkj@sundance.gregorykjohnson.com
 Received: from localhost [127.0.0.1]
-       by localhost with POP3 (fetchmail-6.2.5)
-       for gkj+person@localhost (single-drop); Wed, 13 Jul 2005 17:23:16 -0400 (EDT)
+        by localhost with POP3 (fetchmail-6.2.5)
+        for gkj+person@localhost (single-drop); Wed, 13 Jul 2005 17:23:16 -0400 (EDT)
 Received: from andy.gregorykjohnson.com (andy.gregorykjohnson.com [64.32.235.228])
-       by sundance.gregorykjohnson.com (Postfix) with ESMTP id 5B056316746
-       for <gkj@gregorykjohnson.com>; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)
+        by sundance.gregorykjohnson.com (Postfix) with ESMTP id 5B056316746
+        for <gkj@gregorykjohnson.com>; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)
 Received: by andy.gregorykjohnson.com (Postfix, from userid 1000)
-       id 490CD9DD17; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)
+        id 490CD9DD17; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)
 Date: Wed, 13 Jul 2005 17:23:11 -0400
 From: "Gregory K. Johnson" <gkj@gregorykjohnson.com>
 To: gkj@gregorykjohnson.com
@@ -1701,7 +1701,7 @@ Content-Disposition: inline
 
 This is a sample message.
 
--- 
+--
 Gregory K. Johnson
 
 --NMuMz9nt05w80d4+
@@ -1720,17 +1720,17 @@ _sample_headers = {
     "X-Original-To":"gkj+person@localhost",
     "Delivered-To":"gkj+person@localhost",
     "Received":"""from localhost (localhost [127.0.0.1])
-       by andy.gregorykjohnson.com (Postfix) with ESMTP id 356ED9DD17
-       for <gkj+person@localhost>; Wed, 13 Jul 2005 17:23:16 -0400 (EDT)""",
+        by andy.gregorykjohnson.com (Postfix) with ESMTP id 356ED9DD17
+        for <gkj+person@localhost>; Wed, 13 Jul 2005 17:23:16 -0400 (EDT)""",
     "Delivered-To":"gkj@sundance.gregorykjohnson.com",
     "Received":"""from localhost [127.0.0.1]
-       by localhost with POP3 (fetchmail-6.2.5)
-       for gkj+person@localhost (single-drop); Wed, 13 Jul 2005 17:23:16 -0400 (EDT)""",
+        by localhost with POP3 (fetchmail-6.2.5)
+        for gkj+person@localhost (single-drop); Wed, 13 Jul 2005 17:23:16 -0400 (EDT)""",
     "Received":"""from andy.gregorykjohnson.com (andy.gregorykjohnson.com [64.32.235.228])
-       by sundance.gregorykjohnson.com (Postfix) with ESMTP id 5B056316746
-       for <gkj@gregorykjohnson.com>; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)""",
+        by sundance.gregorykjohnson.com (Postfix) with ESMTP id 5B056316746
+        for <gkj@gregorykjohnson.com>; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)""",
     "Received":"""by andy.gregorykjohnson.com (Postfix, from userid 1000)
-       id 490CD9DD17; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)""",
+        id 490CD9DD17; Wed, 13 Jul 2005 17:23:11 -0400 (EDT)""",
     "Date":"Wed, 13 Jul 2005 17:23:11 -0400",
     "From":""""Gregory K. Johnson" <gkj@gregorykjohnson.com>""",
     "To":"gkj@gregorykjohnson.com",
@@ -1742,7 +1742,7 @@ _sample_headers = {
 
 _sample_payloads = ("""This is a sample message.
 
--- 
+--
 Gregory K. Johnson
 """,
 """H4sICM2D1UIAA3RleHQAC8nILFYAokSFktSKEoW0zJxUPa7wzJIMhZLyfIWczLzUYj0uAHTs