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

Lib/tarfile.py

@@ -1549,27 +1549,33 @@ class TarFile(object):
         self.inodes = {}        # dictionary caching the inodes of
                                 # archive members already added
 
-        if self.mode == "r":
+        try:
-            self.firstmember = None
+            if self.mode == "r":
-            self.firstmember = self.next()
+                self.firstmember = None
+                self.firstmember = self.next()
 
-        if self.mode == "a":
+            if self.mode == "a":
-            # Move to the end of the archive,
+                # Move to the end of the archive,
-            # before the first empty block.
+                # before the first empty block.
-            self.firstmember = None
+                self.firstmember = None
-            while True:
+                while True:
-                if self.next() is None:
+                    if self.next() is None:
-                    if self.offset > 0:
+                        if self.offset > 0:
-                        self.fileobj.seek(self.fileobj.tell() - BLOCKSIZE)
+                            self.fileobj.seek(self.fileobj.tell() - BLOCKSIZE)
-                    break
+                        break
 
-        if self.mode in "aw":
+            if self.mode in "aw":
-            self._loaded = True
+                self._loaded = True
 
-            if self.pax_headers:
+                if self.pax_headers:
-                buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
+                    buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
-                self.fileobj.write(buf)
+                    self.fileobj.write(buf)
-                self.offset += len(buf)
+                    self.offset += len(buf)
+        except:
+            if not self._extfileobj:
+                self.fileobj.close()
+            self.closed = True
+            raise
 
     #--------------------------------------------------------------------------
     # Below are the classmethods which act as alternate constructors to the

Misc/NEWS

@@ -137,6 +137,9 @@ C-API
 Library
 -------
 
+- Issue #7341: Close the internal file object in the TarFile constructor in
+  case of an error.
+
 - Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh
   Windows box. Help provided by David Bolen.