Patch # 1323 by Amaury Forgeot d'Arc.

This patch corrects a problem in test_file.py on Windows:
f.truncate() seeks to the truncation point, but does not empty the
buffers. In the test, f.tell() returns -1...

diff --git a/Lib/io.py b/Lib/io.py
index 07846bfb83fdf2d1717ff742227c89648492252d..b201cb2bb2b6645ad8eeccdf63e9e9368258022c 100644 (file)
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -597,9 +597,24 @@ class _BufferedIOMixin(BufferedIOBase):
         return self.raw.tell()
 
     def truncate(self, pos=None):
+        # On Windows, the truncate operation changes the current position
+        # to the end of the file, which may leave us with desynchronized
+        # buffers.
+        # Since we promise that truncate() won't change the current position,
+        # the easiest thing is to capture current pos now and seek back to
+        # it at the end.
+
+        initialpos = self.tell()
         if pos is None:
-            pos = self.tell()
-        return self.raw.truncate(pos)
+            pos = initialpos
+
+        # Flush the stream.  We're mixing buffered I/O with lower-level I/O,
+        # and a flush may be necessary to synch both views of the current
+        # file state.
+        self.flush()
+        newpos = self.raw.truncate(pos)
+        self.seek(initialpos)
+        return newpos
 
     ### Flush and close ###
 

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index f2718b2274ffc8d3b756eecc3dbb0808b7a4296c..ab29932e8f8ee0e9bea0b4ec6c556b1d846e6b59 100644 (file)
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -181,12 +181,13 @@ class OtherFileTests(unittest.TestCase):
             self.assertEquals(d, s)
 
     def testTruncateOnWindows(self):
+        # SF bug <http://www.python.org/sf/801631>
+        # "file.truncate fault on windows"
+
         os.unlink(TESTFN)
+        f = open(TESTFN, 'wb')
 
-        def bug801631():
-            # SF bug <http://www.python.org/sf/801631>
-            # "file.truncate fault on windows"
-            f = open(TESTFN, 'wb')
+        try:
             f.write(b'12345678901')   # 11 bytes
             f.close()
 
@@ -205,10 +206,8 @@ class OtherFileTests(unittest.TestCase):
             size = os.path.getsize(TESTFN)
             if size != 5:
                 self.fail("File size after ftruncate wrong %d" % size)
-
-        try:
-            bug801631()
         finally:
+            f.close()
             os.unlink(TESTFN)
 
     def testIteration(self):