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).

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,)

Lib/test/test_quopri.py

@@ -5,7 +5,7 @@ from cStringIO import StringIO
 from quopri import *
 
 
-
+
 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!
 """
 
 
-
+
 class QuopriTestCase(unittest.TestCase):
     # Each entry is a tuple of (plaintext, encoded string).  These strings are
     # used in the "quotetabs=0" tests.
@@ -135,5 +135,5 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''')
             self.assert_(encodestring(p, quotetabs=1) == e)
             self.assert_(decodestring(e) == p)
 
-
+
 test_support.run_unittest(QuopriTestCase)