[Python-checkins] r76386 - in python/branches/release26-maint: Lib/tarfile.py Misc/NEWS
lars.gustaebel
python-checkins at python.org
Wed Nov 18 22:09:36 CET 2009
Author: lars.gustaebel
Date: Wed Nov 18 22:09:35 2009
New Revision: 76386
Log:
Merged revisions 76381 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76381 | lars.gustaebel | 2009-11-18 21:24:54 +0100 (Wed, 18 Nov 2009) | 3 lines
Issue #7341: Close the internal file object in the TarFile
constructor in case of an error.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Lib/tarfile.py
python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/tarfile.py
==============================================================================
--- python/branches/release26-maint/Lib/tarfile.py (original)
+++ python/branches/release26-maint/Lib/tarfile.py Wed Nov 18 22:09:35 2009
@@ -1565,27 +1565,33 @@
self.inodes = {} # dictionary caching the inodes of
# archive members already added
- if self.mode == "r":
- self.firstmember = None
- self.firstmember = self.next()
-
- if self.mode == "a":
- # Move to the end of the archive,
- # before the first empty block.
- self.firstmember = None
- while True:
- if self.next() is None:
- if self.offset > 0:
- self.fileobj.seek(- BLOCKSIZE, 1)
- break
-
- if self.mode in "aw":
- self._loaded = True
-
- if self.pax_headers:
- buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
- self.fileobj.write(buf)
- self.offset += len(buf)
+ try:
+ if self.mode == "r":
+ self.firstmember = None
+ self.firstmember = self.next()
+
+ if self.mode == "a":
+ # Move to the end of the archive,
+ # before the first empty block.
+ self.firstmember = None
+ while True:
+ if self.next() is None:
+ if self.offset > 0:
+ self.fileobj.seek(- BLOCKSIZE, 1)
+ break
+
+ if self.mode in "aw":
+ self._loaded = True
+
+ if self.pax_headers:
+ buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
+ self.fileobj.write(buf)
+ self.offset += len(buf)
+ except:
+ if not self._extfileobj:
+ self.fileobj.close()
+ self.closed = True
+ raise
def _getposix(self):
return self.format == USTAR_FORMAT
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Wed Nov 18 22:09:35 2009
@@ -26,6 +26,9 @@
Library
-------
+- Issue #7341: Close the internal file object in the TarFile constructor in
+ case of an error.
+
- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch
- Issue #7318: multiprocessing now uses a timeout when it fails to establish
More information about the Python-checkins
mailing list