Whitespace normalization, plus:

+ test_quopri.py relied on significant trailing spaces.  Fixed.
+ test_dircache.py (still) doesn't work on Windows (directory mtime on
  Windows doesn't work like it does on Unix).

diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 1c9be25a7dc2e685374894f08eeea3c1e2ed43c0..f7b08a67bccc92a570c9eef3ea031127da83fcda 100644 (file)
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -566,10 +566,10 @@ class IMAP4:
         (typ, [data]) = <instance>.sort(sort_criteria, charset, search_criteria, ...)
         """
         name = 'SORT'
-        #if not name in self.capabilities:     # Let the server decide!
-        #      raise self.error('unimplemented extension command: %s' % name)
+        #if not name in self.capabilities:      # Let the server decide!
+        #       raise self.error('unimplemented extension command: %s' % name)
         if (sort_criteria[0],sort_criteria[-1]) != ('(',')'):
-               sort_criteria = '(%s)' % sort_criteria
+            sort_criteria = '(%s)' % sort_criteria
         typ, dat = apply(self._simple_command, (name, sort_criteria, charset) + search_criteria)
         return self._untagged_response(typ, dat, name)
 
@@ -580,7 +580,7 @@ class IMAP4:
         (typ, [data]) = <instance>.status(mailbox, names)
         """
         name = 'STATUS'
-        #if self.PROTOCOL_VERSION == 'IMAP4':  # Let the server decide!
+        #if self.PROTOCOL_VERSION == 'IMAP4':   # Let the server decide!
         #    raise self.error('%s unimplemented in IMAP4 (obtain IMAP4rev1 server, or re-code)' % name)
         typ, dat = self._simple_command(name, mailbox, names)
         return self._untagged_response(typ, dat, name)
@@ -647,7 +647,7 @@ class IMAP4:
         Returns response appropriate to extension command `name'.
         """
         name = name.upper()
-        #if not name in self.capabilities:     # Let the server decide!
+        #if not name in self.capabilities:      # Let the server decide!
         #    raise self.error('unknown extension command: %s' % name)
         if not Commands.has_key(name):
             Commands[name] = (self.state,)

diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py
index ba0a8712f8b9f60d6bc3e13bf78657d895638c47..4dc11a1e4983dc108f77b6f43c4adb4ae274777a 100644 (file)
--- a/Lib/sre_compile.py
+++ b/Lib/sre_compile.py
@@ -286,7 +286,7 @@ def _optimize_unicode(charset, fixup):
         else:
             header.append(mapping[2*i]+256*mapping[2*i+1])
     data[0:0] = header
-    return [(BIGCHARSET, data)]    
+    return [(BIGCHARSET, data)]
 
 def _simple(av):
     # check if av is a "simple" operator

diff --git a/Lib/test/test_dircache.py b/Lib/test/test_dircache.py
index d6e3c24f595d70f5e4e28588a34af4c43d21795e..fa3fe57f89b235b8ea2bbc7d6a1e0f0ad244765b 100644 (file)
--- a/Lib/test/test_dircache.py
+++ b/Lib/test/test_dircache.py
@@ -31,15 +31,15 @@ class DircacheTests(unittest.TestCase):
             os.rmdir(fname)
         else:
             os.unlink(fname)
-    
+
     def test_listdir(self):
         ## SUCCESSFUL CASES
         entries = dircache.listdir(self.tempdir)
         self.assertEquals(entries, [])
 
         # Check that cache is actually caching, not just passing through.
-        self.assert_(dircache.listdir(self.tempdir) is entries) 
-        
+        self.assert_(dircache.listdir(self.tempdir) is entries)
+
         # Sadly, dircache has the same granularity as stat.mtime, and so
         # can't notice any changes that occured within 1 sec of the last
         # time it examined a directory.
@@ -48,7 +48,7 @@ class DircacheTests(unittest.TestCase):
         entries = dircache.listdir(self.tempdir)
         self.assertEquals(entries, ['test1'])
         self.assert_(dircache.listdir(self.tempdir) is entries)
-        
+
         ## UNSUCCESSFUL CASES
         self.assertEquals(dircache.listdir(self.tempdir+"_nonexistent"), [])
 

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index c1889e164e9446ac0deecf144a32869024fb6b1d..470e347dbca6215b2c6a54f21dd05bca8cfe83ff 100644 (file)
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -52,7 +52,7 @@ class TemporaryFileTests(unittest.TestCase):
         if not hasattr(os, "tmpnam"):
             return
         self.check_tempfile(os.tmpnam())
-        
+
 
 
 run_unittest(TemporaryFileTests)

diff --git a/Lib/test/test_quopri.py b/Lib/test/test_quopri.py
index 4fc5f404b8f7a79a7976be36b1f7237103b26a39..f79eb4e0c7e93fdc06f3037586d4ec391beb5b49 100644 (file)
--- a/Lib/test/test_quopri.py
+++ b/Lib/test/test_quopri.py
@@ -5,7 +5,7 @@ from cStringIO import StringIO
 from quopri import *
 
 
-\f
+
 ENCSAMPLE = """\
 Here's a bunch of special=20
 
@@ -25,8 +25,8 @@ characters... have fun!
 """
 
 # First line ends with a space
-DECSAMPLE = """\
-Here's a bunch of special 
+DECSAMPLE = "Here's a bunch of special \n" + \
+"""\
 
 ¡¢£¤¥¦§¨©
 ª«¬­®¯°±²³
@@ -44,7 +44,7 @@ characters... have fun!
 """
 
 
-\f
+
 class QuopriTestCase(unittest.TestCase):
     # Each entry is a tuple of (plaintext, encoded string).  These strings are
     # used in the "quotetabs=0" tests.
@@ -103,15 +103,15 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''')
         ('hello world', 'hello=20world'),
         ('hello\tworld', 'hello=09world'),
         )
-        
+
     def test_encodestring(self):
         for p, e in self.STRINGS:
             self.assert_(encodestring(p) == e)
-        
+
     def test_decodestring(self):
         for p, e in self.STRINGS:
             self.assert_(decodestring(e) == p)
-        
+
     def test_idempotent_string(self):
         for p, e in self.STRINGS:
             self.assert_(decodestring(encodestring(e)) == e)
@@ -135,5 +135,5 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''')
             self.assert_(encodestring(p, quotetabs=1) == e)
             self.assert_(decodestring(e) == p)
 
-\f
+
 test_support.run_unittest(QuopriTestCase)