[Python-checkins] r84985 - in python/branches/py3k/Lib: tarfile.py test/test_tarfile.py

Thu Sep 23 22:15:14 CEST 2010

Author: antoine.pitrou
Date: Thu Sep 23 22:15:14 2010
New Revision: 84985
Log:
Further tarfile / test_tarfile cleanup
Modified:
 python/branches/py3k/Lib/tarfile.py
 python/branches/py3k/Lib/test/test_tarfile.py
Modified: python/branches/py3k/Lib/tarfile.py
==============================================================================

--- python/branches/py3k/Lib/tarfile.py	(original)
+++ python/branches/py3k/Lib/tarfile.py	Thu Sep 23 22:15:14 2010
@@ -410,28 +410,34 @@
 self.pos = 0
 self.closed = False
 
- if comptype == "gz":
- try:
- import zlib
- except ImportError:
- raise CompressionError("zlib module is not available")
- self.zlib = zlib
- self.crc = zlib.crc32(b"")
- if mode == "r":
- self._init_read_gz()
- else:
- self._init_write_gz()
+ try:
+ if comptype == "gz":
+ try:
+ import zlib
+ except ImportError:
+ raise CompressionError("zlib module is not available")
+ self.zlib = zlib
+ self.crc = zlib.crc32(b"")
+ if mode == "r":
+ self._init_read_gz()
+ else:
+ self._init_write_gz()
 
- if comptype == "bz2":
- try:
- import bz2
- except ImportError:
- raise CompressionError("bz2 module is not available")
- if mode == "r":
- self.dbuf = b""
- self.cmp = bz2.BZ2Decompressor()
- else:
- self.cmp = bz2.BZ2Compressor()
+ if comptype == "bz2":
+ try:
+ import bz2
+ except ImportError:
+ raise CompressionError("bz2 module is not available")
+ if mode == "r":
+ self.dbuf = b""
+ self.cmp = bz2.BZ2Decompressor()
+ else:
+ self.cmp = bz2.BZ2Compressor()
+ except:
+ if not self._extfileobj:
+ self.fileobj.close()
+ self.closed = True
+ raise
 
 def __del__(self):
 if hasattr(self, "closed") and not self.closed:
@@ -1729,9 +1735,12 @@
 if filemode not in "rw":
 raise ValueError("mode must be 'r' or 'w'")
 
- t = cls(name, filemode,
- _Stream(name, filemode, comptype, fileobj, bufsize),
- **kwargs)
+ stream = _Stream(name, filemode, comptype, fileobj, bufsize)
+ try:
+ t = cls(name, filemode, stream, **kwargs)
+ except:
+ stream.close()
+ raise
 t._extfileobj = False
 return t
 
Modified: python/branches/py3k/Lib/test/test_tarfile.py
==============================================================================
--- python/branches/py3k/Lib/test/test_tarfile.py	(original)
+++ python/branches/py3k/Lib/test/test_tarfile.py	Thu Sep 23 22:15:14 2010
@@ -423,7 +423,8 @@
 
 def _testfunc_fileobj(self, name, mode):
 try:
- tar = tarfile.open(name, mode, fileobj=open(name, "rb"))
+ with open(name, "rb") as f:
+ tar = tarfile.open(name, mode, fileobj=f)
 except tarfile.ReadError as e:
 self.fail()
 else:
