[Python-checkins] r86025 - in python/branches/release27-maint: Lib/test/test_fileio.py Misc/NEWS Modules/_io/fileio.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Oct 31 14:05:48 2010
New Revision: 86025

Log:
Merged revisions 85982 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85982 | antoine.pitrou | 2010-10-30 18:19:14 +0200 (sam., 30 oct. 2010) | 4 lines
  
  Issue #10253: FileIO leaks a file descriptor when trying to open a file
  for append that isn't seekable.  Patch by Brian Brazil.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_fileio.py
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Modules/_io/fileio.c

Modified: python/branches/release27-maint/Lib/test/test_fileio.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_fileio.py	(original)
+++ python/branches/release27-maint/Lib/test/test_fileio.py	Sun Oct 31 14:05:48 2010
@@ -341,6 +341,7 @@
         f.truncate(15)
         self.assertEqual(f.tell(), 5)
         self.assertEqual(f.seek(0, os.SEEK_END), 15)
+        f.close()
 
     def testTruncateOnWindows(self):
         def bug801631():

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sun Oct 31 14:05:48 2010
@@ -66,6 +66,9 @@
 Library
 -------
 
+- Issue #10253: FileIO leaks a file descriptor when trying to open a file
+  for append that isn't seekable.  Patch by Brian Brazil.
+
 - Issue #6105: json.dumps now respects OrderedDict's iteration order.
 
 - Issue #9295: Fix a crash under Windows when calling close() on a file

Modified: python/branches/release27-maint/Modules/_io/fileio.c
==============================================================================
--- python/branches/release27-maint/Modules/_io/fileio.c	(original)
+++ python/branches/release27-maint/Modules/_io/fileio.c	Sun Oct 31 14:05:48 2010
@@ -367,8 +367,13 @@
            end of file (otherwise, it might be done only on the
            first write()). */
         PyObject *pos = portable_lseek(self->fd, NULL, 2);
-        if (pos == NULL)
+        if (pos == NULL) {
+            if (closefd) {
+                close(self->fd);
+                self->fd = -1;
+            }
             goto error;
+        }
         Py_DECREF(pos);
     }