From: Petri Lehtinen <petri@digip.org>
Date: Sat, 12 Nov 2011 19:15:12 +0000 (+0200)
Subject: Merge branch 3.2
X-Git-Tag: v3.3.0a1~855^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=516d80530ba1871e192f1ac50bf8b5e7be77c827;p=thirdparty%2FPython%2Fcpython.git

Merge branch 3.2
---

516d80530ba1871e192f1ac50bf8b5e7be77c827
diff --cc Lib/test/test_mailbox.py
index 17aebc7a714f,007c419b9dec..a1c684e0c568
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@@ -921,9 -926,11 +926,10 @@@ class TestMaildir(TestMailbox)
          self.assertFalse(refreshed())
  
          # Now, write something into cur and remove it.  This changes
-         # the mtime and should cause a re-read.
+         # the mtime and should cause a re-read. Note that "sleep
+         # emulation" is still in effect, as skewfactor is -3.
          filename = os.path.join(self._path, 'cur', 'stray-file')
 -        f = open(filename, 'w')
 -        f.close()
 +        support.create_empty_file(filename)
          os.unlink(filename)
          self._box._refresh()
          self.assertTrue(refreshed())