mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 10:26:02 +00:00 
			
		
		
		
	 cf297e46b8
			
		
	
	
		cf297e46b8
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/trunk
........
  r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
  We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
  r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
  Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
  r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
  1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
     Suggested solution by Christos Georgiou, Bug 791968.
  2. Clean up tests, were not failing when they should have been.
  4. Remove some camelcase and an unneeded try/except block.
........
  r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
  Clean up ModifiedInterpreter.runcode() structure
........
  r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
  Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
  r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
  Patch #1652681: create nonexistent files in append mode and
  allow appending to empty files.
........
  r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
  Updated patch (CodeContext.061217.patch) to
  [ 1362975 ] CodeContext - Improved text indentation
  Tal Einat 16Dec06
........
  r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
  narrow exception per [ 1540849 ] except too broad
........
  r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
  [ 1621265 ] Auto-completion list placement
  Move AC window below input line unless not enough space, then put it above.
  Patch: Tal Einat
........
  r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
  Handle AttributeError during calltip lookup
........
  r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
  SF #1615701:  make d.update(m) honor __getitem__() and keys() in dict subclasses
........
  r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
  SF: 1397711 Set docs conflated immutable and hashable
........
  r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
  Check for a common user error with defaultdict().
........
  r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
  Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
  r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
  Silence compiler warning
........
  r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
  Do not let overflows in enumerate() and count() pass silently.
........
  r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
  Bypass set specific optimizations for set and frozenset subclasses.
........
  r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
  Fix docstring bug
........
  r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
  Bug #1653736: Complain about keyword arguments to time.isoformat.
  Will backport to 2.5.
........
  r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
  Corrected some bugs in AutoComplete.  Also, Page Up/Down in ACW implemented;
  mouse and cursor selection in ACWindow implemented; double Tab inserts current
  selection and closes ACW (similar to double-click and Return); scroll wheel now
  works in ACW.  Added AutoComplete instructions to IDLE Help.
........
  r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
  Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
  Will backport.
........
  r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
  Bug #1600860: Search for shared python library in LIBDIR, not
  lib/python/config, on "linux" and "gnu" systems.
  Will backport.
........
  r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
  Update broken link. Will backport to 2.5.
........
  r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
  Bug #1656078: typo in in profile docs.
........
  r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
  Change a very minor inconsistency (that is purely cosmetic) in the AST
  definition.
........
  r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
  fix trace.py --ignore-dir
........
  r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
  Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
  r53731).
........
  r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
  Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
  is specified at the top of the file.  Also add a note that Python/Python-ast.c
  needs to be committed separately after a change to the AST grammar to capture
  the revision number of the change (which is what __version__ is set to).
........
  r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
  Bug #1656581: Point out that external file objects are supposed to be
  at position 0.
........
  r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
  Patch 1463026: Support default namespace in XMLGenerator.
  Fixes #847665. Will backport.
........
  r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
  Fix the line to what is my guess at the original author's meaning.
  (The line has no effect anyway, but is present because it's
  customary call the base class __init__).
........
  r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
  Patch #685268: Consider a package's __path__ in imputil.
  Will backport.
........
  r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
  Patch #698833: Support file decryption in zipfile.
........
  r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
  Patch #1517891: Make 'a' create the file if it doesn't exist.
  Fixes #1514451.
........
  r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
  Bug #1658794: Remove extraneous 'this'.
  Will backport to 2.5.
........
  r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
  Patch #1657276: Make NETLINK_DNRTMSG conditional.
  Will backport.
........
  r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
  Patch #1647484: Renamed GzipFile's filename attribute to name. The
  filename attribute is still accessible as a property that emits a
  DeprecationWarning.
........
  r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
  Strip the '.gz' extension from the filename that is written to the
  gzip header.
........
  r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
  Patch #1432399: Add HCI sockets.
........
  r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
  Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
  r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
  Ignore directory time stamps when considering
  whether to rerun libffi configure.
........
  r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
  A missing binary mode in AppendTest caused failures in Windows
  Buildbot.
........
  r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
  Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
  r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
  Make functools.wraps() docs a bit clearer.
........
  r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
  Patch #1494140: Add documentation for the new struct.Struct object.
........
  r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
  Add missing \versionadded.
........
  r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
  Update the encoding package's search function to use absolute imports when
  calling __import__.  This helps make the expected search locations for encoding
  modules be more explicit.
  One could use an explicit value for __path__ when making the call to __import__
  to force the exact location searched for encodings.  This would give the most
  strict search path possible if one is worried about malicious code being
  imported.  The unfortunate side-effect of that is that if __path__ was modified
  on 'encodings' on purpose in a safe way it would not be picked up in future
  __import__ calls.
........
  r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
  Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
  r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
  Minor fix for currentframe (SF #1652788).
........
  r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
  Extend work on revision 52962:  Eliminate redundant calls to PyObject_Hash().
........
  r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
  Add merge() function to heapq.
........
  r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
  Add tie-breaker count to preserve sort stability.
........
  r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
  Use C heapreplace() instead of slower _siftup() in pure python.
........
  r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
  Add test for merge stability
........
  r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
  Provide an example of defaultdict with non-zero constant factory function.
........
  r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
  Moved misplaced news item.
........
  r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
  Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
  functions on platforms where the underlying system calls are available.
........
  r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
  Fixup docstrings for merge().
........
  r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
  Fixup set/dict interoperability.
........
  r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
  Add itertools.izip_longest().
........
  r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
  Remove filler struct item and fix leak.
........
		
	
			
		
			
				
	
	
		
			809 lines
		
	
	
	
		
			24 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			809 lines
		
	
	
	
		
			24 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| import sys
 | |
| import os
 | |
| import shutil
 | |
| import tempfile
 | |
| import StringIO
 | |
| 
 | |
| import unittest
 | |
| import tarfile
 | |
| 
 | |
| from test import test_support
 | |
| 
 | |
| # Check for our compression modules.
 | |
| try:
 | |
|     import gzip
 | |
|     gzip.GzipFile
 | |
| except (ImportError, AttributeError):
 | |
|     gzip = None
 | |
| try:
 | |
|     import bz2
 | |
| except ImportError:
 | |
|     bz2 = None
 | |
| 
 | |
| def path(path):
 | |
|     return test_support.findfile(path)
 | |
| 
 | |
| testtar = path("testtar.tar")
 | |
| tempdir = os.path.join(tempfile.gettempdir(), "testtar" + os.extsep + "dir")
 | |
| tempname = test_support.TESTFN
 | |
| membercount = 12
 | |
| 
 | |
| def tarname(comp=""):
 | |
|     if not comp:
 | |
|         return testtar
 | |
|     return os.path.join(tempdir, "%s%s%s" % (testtar, os.extsep, comp))
 | |
| 
 | |
| def dirname():
 | |
|     if not os.path.exists(tempdir):
 | |
|         os.mkdir(tempdir)
 | |
|     return tempdir
 | |
| 
 | |
| def tmpname():
 | |
|     return tempname
 | |
| 
 | |
| 
 | |
| class BaseTest(unittest.TestCase):
 | |
|     comp = ''
 | |
|     mode = 'r'
 | |
|     sep = ':'
 | |
| 
 | |
|     def setUp(self):
 | |
|         mode = self.mode + self.sep + self.comp
 | |
|         self.tar = tarfile.open(tarname(self.comp), mode)
 | |
| 
 | |
|     def tearDown(self):
 | |
|         self.tar.close()
 | |
| 
 | |
| class ReadTest(BaseTest):
 | |
| 
 | |
|     def test(self):
 | |
|         """Test member extraction.
 | |
|         """
 | |
|         members = 0
 | |
|         for tarinfo in self.tar:
 | |
|             members += 1
 | |
|             if not tarinfo.isreg():
 | |
|                 continue
 | |
|             f = self.tar.extractfile(tarinfo)
 | |
|             self.assert_(len(f.read()) == tarinfo.size,
 | |
|                          "size read does not match expected size")
 | |
|             f.close()
 | |
| 
 | |
|         self.assert_(members == membercount,
 | |
|                      "could not find all members")
 | |
| 
 | |
|     def test_sparse(self):
 | |
|         """Test sparse member extraction.
 | |
|         """
 | |
|         if self.sep != "|":
 | |
|             f1 = self.tar.extractfile("S-SPARSE")
 | |
|             f2 = self.tar.extractfile("S-SPARSE-WITH-NULLS")
 | |
|             self.assert_(f1.read() == f2.read(),
 | |
|                          "_FileObject failed on sparse file member")
 | |
| 
 | |
|     def test_readlines(self):
 | |
|         """Test readlines() method of _FileObject.
 | |
|         """
 | |
|         if self.sep != "|":
 | |
|             filename = "0-REGTYPE-TEXT"
 | |
|             self.tar.extract(filename, dirname())
 | |
|             f = open(os.path.join(dirname(), filename), "rU")
 | |
|             lines1 = f.readlines()
 | |
|             f.close()
 | |
|             lines2 = self.tar.extractfile(filename).readlines()
 | |
|             self.assert_(lines1 == lines2,
 | |
|                          "_FileObject.readline() does not work correctly")
 | |
| 
 | |
|     def test_iter(self):
 | |
|         # Test iteration over ExFileObject.
 | |
|         if self.sep != "|":
 | |
|             filename = "0-REGTYPE-TEXT"
 | |
|             self.tar.extract(filename, dirname())
 | |
|             f = open(os.path.join(dirname(), filename), "rU")
 | |
|             lines1 = f.readlines()
 | |
|             f.close()
 | |
|             lines2 = [line for line in self.tar.extractfile(filename)]
 | |
|             self.assert_(lines1 == lines2,
 | |
|                          "ExFileObject iteration does not work correctly")
 | |
| 
 | |
|     def test_seek(self):
 | |
|         """Test seek() method of _FileObject, incl. random reading.
 | |
|         """
 | |
|         if self.sep != "|":
 | |
|             filename = "0-REGTYPE-TEXT"
 | |
|             self.tar.extract(filename, dirname())
 | |
|             f = open(os.path.join(dirname(), filename), "rb")
 | |
|             data = f.read()
 | |
|             f.close()
 | |
| 
 | |
|             tarinfo = self.tar.getmember(filename)
 | |
|             fobj = self.tar.extractfile(tarinfo)
 | |
| 
 | |
|             text = fobj.read()
 | |
|             fobj.seek(0)
 | |
|             self.assert_(0 == fobj.tell(),
 | |
|                          "seek() to file's start failed")
 | |
|             fobj.seek(2048, 0)
 | |
|             self.assert_(2048 == fobj.tell(),
 | |
|                          "seek() to absolute position failed")
 | |
|             fobj.seek(-1024, 1)
 | |
|             self.assert_(1024 == fobj.tell(),
 | |
|                          "seek() to negative relative position failed")
 | |
|             fobj.seek(1024, 1)
 | |
|             self.assert_(2048 == fobj.tell(),
 | |
|                          "seek() to positive relative position failed")
 | |
|             s = fobj.read(10)
 | |
|             self.assert_(s == data[2048:2058],
 | |
|                          "read() after seek failed")
 | |
|             fobj.seek(0, 2)
 | |
|             self.assert_(tarinfo.size == fobj.tell(),
 | |
|                          "seek() to file's end failed")
 | |
|             self.assert_(fobj.read() == "",
 | |
|                          "read() at file's end did not return empty string")
 | |
|             fobj.seek(-tarinfo.size, 2)
 | |
|             self.assert_(0 == fobj.tell(),
 | |
|                          "relative seek() to file's start failed")
 | |
|             fobj.seek(512)
 | |
|             s1 = fobj.readlines()
 | |
|             fobj.seek(512)
 | |
|             s2 = fobj.readlines()
 | |
|             self.assert_(s1 == s2,
 | |
|                          "readlines() after seek failed")
 | |
|             fobj.seek(0)
 | |
|             self.assert_(len(fobj.readline()) == fobj.tell(),
 | |
|                          "tell() after readline() failed")
 | |
|             fobj.seek(512)
 | |
|             self.assert_(len(fobj.readline()) + 512 == fobj.tell(),
 | |
|                          "tell() after seek() and readline() failed")
 | |
|             fobj.seek(0)
 | |
|             line = fobj.readline()
 | |
|             self.assert_(fobj.read() == data[len(line):],
 | |
|                          "read() after readline() failed")
 | |
|             fobj.close()
 | |
| 
 | |
|     def test_old_dirtype(self):
 | |
|         """Test old style dirtype member (bug #1336623).
 | |
|         """
 | |
|         # Old tars create directory members using a REGTYPE
 | |
|         # header with a "/" appended to the filename field.
 | |
| 
 | |
|         # Create an old tar style directory entry.
 | |
|         filename = tmpname()
 | |
|         tarinfo = tarfile.TarInfo("directory/")
 | |
|         tarinfo.type = tarfile.REGTYPE
 | |
| 
 | |
|         fobj = open(filename, "w")
 | |
|         fobj.write(tarinfo.tobuf())
 | |
|         fobj.close()
 | |
| 
 | |
|         try:
 | |
|             # Test if it is still a directory entry when
 | |
|             # read back.
 | |
|             tar = tarfile.open(filename)
 | |
|             tarinfo = tar.getmembers()[0]
 | |
|             tar.close()
 | |
| 
 | |
|             self.assert_(tarinfo.type == tarfile.DIRTYPE)
 | |
|             self.assert_(tarinfo.name.endswith("/"))
 | |
|         finally:
 | |
|             try:
 | |
|                 os.unlink(filename)
 | |
|             except:
 | |
|                 pass
 | |
| 
 | |
| class ReadStreamTest(ReadTest):
 | |
|     sep = "|"
 | |
| 
 | |
|     def test(self):
 | |
|         """Test member extraction, and for StreamError when
 | |
|            seeking backwards.
 | |
|         """
 | |
|         ReadTest.test(self)
 | |
|         tarinfo = self.tar.getmembers()[0]
 | |
|         f = self.tar.extractfile(tarinfo)
 | |
|         self.assertRaises(tarfile.StreamError, f.read)
 | |
| 
 | |
|     def test_stream(self):
 | |
|         """Compare the normal tar and the stream tar.
 | |
|         """
 | |
|         stream = self.tar
 | |
|         tar = tarfile.open(tarname(), 'r')
 | |
| 
 | |
|         while 1:
 | |
|             t1 = tar.next()
 | |
|             t2 = stream.next()
 | |
|             if t1 is None:
 | |
|                 break
 | |
|             self.assert_(t2 is not None, "stream.next() failed.")
 | |
| 
 | |
|             if t2.islnk() or t2.issym():
 | |
|                 self.assertRaises(tarfile.StreamError, stream.extractfile, t2)
 | |
|                 continue
 | |
|             v1 = tar.extractfile(t1)
 | |
|             v2 = stream.extractfile(t2)
 | |
|             if v1 is None:
 | |
|                 continue
 | |
|             self.assert_(v2 is not None, "stream.extractfile() failed")
 | |
|             self.assert_(v1.read() == v2.read(), "stream extraction failed")
 | |
| 
 | |
|         tar.close()
 | |
|         stream.close()
 | |
| 
 | |
| class ReadDetectTest(ReadTest):
 | |
| 
 | |
|     def setUp(self):
 | |
|         self.tar = tarfile.open(tarname(self.comp), self.mode)
 | |
| 
 | |
| class ReadDetectFileobjTest(ReadTest):
 | |
| 
 | |
|     def setUp(self):
 | |
|         name = tarname(self.comp)
 | |
|         self.tar = tarfile.open(name, mode=self.mode,
 | |
|                                 fileobj=open(name, "rb"))
 | |
| 
 | |
| class ReadAsteriskTest(ReadTest):
 | |
| 
 | |
|     def setUp(self):
 | |
|         mode = self.mode + self.sep + "*"
 | |
|         self.tar = tarfile.open(tarname(self.comp), mode)
 | |
| 
 | |
| class ReadStreamAsteriskTest(ReadStreamTest):
 | |
| 
 | |
|     def setUp(self):
 | |
|         mode = self.mode + self.sep + "*"
 | |
|         self.tar = tarfile.open(tarname(self.comp), mode)
 | |
| 
 | |
| class WriteTest(BaseTest):
 | |
|     mode = 'w'
 | |
| 
 | |
|     def setUp(self):
 | |
|         mode = self.mode + self.sep + self.comp
 | |
|         self.src = tarfile.open(tarname(self.comp), 'r')
 | |
|         self.dstname = tmpname()
 | |
|         self.dst = tarfile.open(self.dstname, mode)
 | |
| 
 | |
|     def tearDown(self):
 | |
|         self.src.close()
 | |
|         self.dst.close()
 | |
| 
 | |
|     def test_posix(self):
 | |
|         self.dst.posix = 1
 | |
|         self._test()
 | |
| 
 | |
|     def test_nonposix(self):
 | |
|         self.dst.posix = 0
 | |
|         self._test()
 | |
| 
 | |
|     def test_small(self):
 | |
|         self.dst.add(os.path.join(os.path.dirname(__file__),"cfgparser.1"))
 | |
|         self.dst.close()
 | |
|         self.assertNotEqual(os.stat(self.dstname).st_size, 0)
 | |
| 
 | |
|     def _test(self):
 | |
|         for tarinfo in self.src:
 | |
|             if not tarinfo.isreg():
 | |
|                 continue
 | |
|             f = self.src.extractfile(tarinfo)
 | |
|             if self.dst.posix and len(tarinfo.name) > tarfile.LENGTH_NAME and "/" not in tarinfo.name:
 | |
|                 self.assertRaises(ValueError, self.dst.addfile,
 | |
|                                  tarinfo, f)
 | |
|             else:
 | |
|                 self.dst.addfile(tarinfo, f)
 | |
| 
 | |
|     def test_add_self(self):
 | |
|         dstname = os.path.abspath(self.dstname)
 | |
| 
 | |
|         self.assertEqual(self.dst.name, dstname, "archive name must be absolute")
 | |
| 
 | |
|         self.dst.add(dstname)
 | |
|         self.assertEqual(self.dst.getnames(), [], "added the archive to itself")
 | |
| 
 | |
|         cwd = os.getcwd()
 | |
|         os.chdir(dirname())
 | |
|         self.dst.add(dstname)
 | |
|         os.chdir(cwd)
 | |
|         self.assertEqual(self.dst.getnames(), [], "added the archive to itself")
 | |
| 
 | |
| 
 | |
| class AppendTest(unittest.TestCase):
 | |
|     # Test append mode (cp. patch #1652681).
 | |
| 
 | |
|     def setUp(self):
 | |
|         self.tarname = tmpname()
 | |
|         if os.path.exists(self.tarname):
 | |
|             os.remove(self.tarname)
 | |
| 
 | |
|     def _add_testfile(self, fileobj=None):
 | |
|         tar = tarfile.open(self.tarname, "a", fileobj=fileobj)
 | |
|         tar.addfile(tarfile.TarInfo("bar"))
 | |
|         tar.close()
 | |
| 
 | |
|     def _create_testtar(self):
 | |
|         src = tarfile.open(tarname())
 | |
|         t = src.getmember("0-REGTYPE")
 | |
|         t.name = "foo"
 | |
|         f = src.extractfile(t)
 | |
|         tar = tarfile.open(self.tarname, "w")
 | |
|         tar.addfile(t, f)
 | |
|         tar.close()
 | |
| 
 | |
|     def _test(self, names=["bar"], fileobj=None):
 | |
|         tar = tarfile.open(self.tarname, fileobj=fileobj)
 | |
|         self.assert_(tar.getnames() == names)
 | |
| 
 | |
|     def test_non_existing(self):
 | |
|         self._add_testfile()
 | |
|         self._test()
 | |
| 
 | |
|     def test_empty(self):
 | |
|         open(self.tarname, "wb").close()
 | |
|         self._add_testfile()
 | |
|         self._test()
 | |
| 
 | |
|     def test_empty_fileobj(self):
 | |
|         fobj = StringIO.StringIO()
 | |
|         self._add_testfile(fobj)
 | |
|         fobj.seek(0)
 | |
|         self._test(fileobj=fobj)
 | |
| 
 | |
|     def test_fileobj(self):
 | |
|         self._create_testtar()
 | |
|         data = open(self.tarname, "rb").read()
 | |
|         fobj = StringIO.StringIO(data)
 | |
|         self._add_testfile(fobj)
 | |
|         fobj.seek(0)
 | |
|         self._test(names=["foo", "bar"], fileobj=fobj)
 | |
| 
 | |
|     def test_existing(self):
 | |
|         self._create_testtar()
 | |
|         self._add_testfile()
 | |
|         self._test(names=["foo", "bar"])
 | |
| 
 | |
| 
 | |
| class Write100Test(BaseTest):
 | |
|     # The name field in a tar header stores strings of at most 100 chars.
 | |
|     # If a string is shorter than 100 chars it has to be padded with '\0',
 | |
|     # which implies that a string of exactly 100 chars is stored without
 | |
|     # a trailing '\0'.
 | |
| 
 | |
|     def setUp(self):
 | |
|         self.name = "01234567890123456789012345678901234567890123456789"
 | |
|         self.name += "01234567890123456789012345678901234567890123456789"
 | |
| 
 | |
|         self.tar = tarfile.open(tmpname(), "w")
 | |
|         t = tarfile.TarInfo(self.name)
 | |
|         self.tar.addfile(t)
 | |
|         self.tar.close()
 | |
| 
 | |
|         self.tar = tarfile.open(tmpname())
 | |
| 
 | |
|     def tearDown(self):
 | |
|         self.tar.close()
 | |
| 
 | |
|     def test(self):
 | |
|         self.assertEqual(self.tar.getnames()[0], self.name,
 | |
|                 "failed to store 100 char filename")
 | |
| 
 | |
| 
 | |
| class WriteSize0Test(BaseTest):
 | |
|     mode = 'w'
 | |
| 
 | |
|     def setUp(self):
 | |
|         self.tmpdir = dirname()
 | |
|         self.dstname = tmpname()
 | |
|         self.dst = tarfile.open(self.dstname, "w")
 | |
| 
 | |
|     def tearDown(self):
 | |
|         self.dst.close()
 | |
| 
 | |
|     def test_file(self):
 | |
|         path = os.path.join(self.tmpdir, "file")
 | |
|         f = open(path, "w")
 | |
|         f.close()
 | |
|         tarinfo = self.dst.gettarinfo(path)
 | |
|         self.assertEqual(tarinfo.size, 0)
 | |
|         f = open(path, "w")
 | |
|         f.write("aaa")
 | |
|         f.close()
 | |
|         tarinfo = self.dst.gettarinfo(path)
 | |
|         self.assertEqual(tarinfo.size, 3)
 | |
| 
 | |
|     def test_directory(self):
 | |
|         path = os.path.join(self.tmpdir, "directory")
 | |
|         if os.path.exists(path):
 | |
|             # This shouldn't be necessary, but is <wink> if a previous
 | |
|             # run was killed in mid-stream.
 | |
|             shutil.rmtree(path)
 | |
|         os.mkdir(path)
 | |
|         tarinfo = self.dst.gettarinfo(path)
 | |
|         self.assertEqual(tarinfo.size, 0)
 | |
| 
 | |
|     def test_symlink(self):
 | |
|         if hasattr(os, "symlink"):
 | |
|             path = os.path.join(self.tmpdir, "symlink")
 | |
|             os.symlink("link_target", path)
 | |
|             tarinfo = self.dst.gettarinfo(path)
 | |
|             self.assertEqual(tarinfo.size, 0)
 | |
| 
 | |
| 
 | |
| class WriteStreamTest(WriteTest):
 | |
|     sep = '|'
 | |
| 
 | |
|     def test_padding(self):
 | |
|         self.dst.close()
 | |
| 
 | |
|         if self.comp == "gz":
 | |
|             f = gzip.GzipFile(self.dstname)
 | |
|             s = f.read()
 | |
|             f.close()
 | |
|         elif self.comp == "bz2":
 | |
|             f = bz2.BZ2Decompressor()
 | |
|             s = open(self.dstname).read()
 | |
|             s = f.decompress(s)
 | |
|             self.assertEqual(len(f.unused_data), 0, "trailing data")
 | |
|         else:
 | |
|             f = open(self.dstname)
 | |
|             s = f.read()
 | |
|             f.close()
 | |
| 
 | |
|         self.assertEqual(s.count("\0"), tarfile.RECORDSIZE,
 | |
|                          "incorrect zero padding")
 | |
| 
 | |
| 
 | |
| class WriteGNULongTest(unittest.TestCase):
 | |
|     """This testcase checks for correct creation of GNU Longname
 | |
|        and Longlink extensions.
 | |
| 
 | |
|        It creates a tarfile and adds empty members with either
 | |
|        long names, long linknames or both and compares the size
 | |
|        of the tarfile with the expected size.
 | |
| 
 | |
|        It checks for SF bug #812325 in TarFile._create_gnulong().
 | |
| 
 | |
|        While I was writing this testcase, I noticed a second bug
 | |
|        in the same method:
 | |
|        Long{names,links} weren't null-terminated which lead to
 | |
|        bad tarfiles when their length was a multiple of 512. This
 | |
|        is tested as well.
 | |
|     """
 | |
| 
 | |
|     def _length(self, s):
 | |
|         blocks, remainder = divmod(len(s) + 1, 512)
 | |
|         if remainder:
 | |
|             blocks += 1
 | |
|         return blocks * 512
 | |
| 
 | |
|     def _calc_size(self, name, link=None):
 | |
|         # initial tar header
 | |
|         count = 512
 | |
| 
 | |
|         if len(name) > tarfile.LENGTH_NAME:
 | |
|             # gnu longname extended header + longname
 | |
|             count += 512
 | |
|             count += self._length(name)
 | |
| 
 | |
|         if link is not None and len(link) > tarfile.LENGTH_LINK:
 | |
|             # gnu longlink extended header + longlink
 | |
|             count += 512
 | |
|             count += self._length(link)
 | |
| 
 | |
|         return count
 | |
| 
 | |
|     def _test(self, name, link=None):
 | |
|         tarinfo = tarfile.TarInfo(name)
 | |
|         if link:
 | |
|             tarinfo.linkname = link
 | |
|             tarinfo.type = tarfile.LNKTYPE
 | |
| 
 | |
|         tar = tarfile.open(tmpname(), "w")
 | |
|         tar.posix = False
 | |
|         tar.addfile(tarinfo)
 | |
| 
 | |
|         v1 = self._calc_size(name, link)
 | |
|         v2 = tar.offset
 | |
|         self.assertEqual(v1, v2, "GNU longname/longlink creation failed")
 | |
| 
 | |
|         tar.close()
 | |
| 
 | |
|         tar = tarfile.open(tmpname())
 | |
|         member = tar.next()
 | |
|         self.failIf(member is None, "unable to read longname member")
 | |
|         self.assert_(tarinfo.name == member.name and \
 | |
|                      tarinfo.linkname == member.linkname, \
 | |
|                      "unable to read longname member")
 | |
| 
 | |
|     def test_longname_1023(self):
 | |
|         self._test(("longnam/" * 127) + "longnam")
 | |
| 
 | |
|     def test_longname_1024(self):
 | |
|         self._test(("longnam/" * 127) + "longname")
 | |
| 
 | |
|     def test_longname_1025(self):
 | |
|         self._test(("longnam/" * 127) + "longname_")
 | |
| 
 | |
|     def test_longlink_1023(self):
 | |
|         self._test("name", ("longlnk/" * 127) + "longlnk")
 | |
| 
 | |
|     def test_longlink_1024(self):
 | |
|         self._test("name", ("longlnk/" * 127) + "longlink")
 | |
| 
 | |
|     def test_longlink_1025(self):
 | |
|         self._test("name", ("longlnk/" * 127) + "longlink_")
 | |
| 
 | |
|     def test_longnamelink_1023(self):
 | |
|         self._test(("longnam/" * 127) + "longnam",
 | |
|                    ("longlnk/" * 127) + "longlnk")
 | |
| 
 | |
|     def test_longnamelink_1024(self):
 | |
|         self._test(("longnam/" * 127) + "longname",
 | |
|                    ("longlnk/" * 127) + "longlink")
 | |
| 
 | |
|     def test_longnamelink_1025(self):
 | |
|         self._test(("longnam/" * 127) + "longname_",
 | |
|                    ("longlnk/" * 127) + "longlink_")
 | |
| 
 | |
| class ReadGNULongTest(unittest.TestCase):
 | |
| 
 | |
|     def setUp(self):
 | |
|         self.tar = tarfile.open(tarname())
 | |
| 
 | |
|     def tearDown(self):
 | |
|         self.tar.close()
 | |
| 
 | |
|     def test_1471427(self):
 | |
|         """Test reading of longname (bug #1471427).
 | |
|         """
 | |
|         name = "test/" * 20 + "0-REGTYPE"
 | |
|         try:
 | |
|             tarinfo = self.tar.getmember(name)
 | |
|         except KeyError:
 | |
|             tarinfo = None
 | |
|         self.assert_(tarinfo is not None, "longname not found")
 | |
|         self.assert_(tarinfo.type != tarfile.DIRTYPE, "read longname as dirtype")
 | |
| 
 | |
|     def test_read_name(self):
 | |
|         name = ("0-LONGNAME-" * 10)[:101]
 | |
|         try:
 | |
|             tarinfo = self.tar.getmember(name)
 | |
|         except KeyError:
 | |
|             tarinfo = None
 | |
|         self.assert_(tarinfo is not None, "longname not found")
 | |
| 
 | |
|     def test_read_link(self):
 | |
|         link = ("1-LONGLINK-" * 10)[:101]
 | |
|         name = ("0-LONGNAME-" * 10)[:101]
 | |
|         try:
 | |
|             tarinfo = self.tar.getmember(link)
 | |
|         except KeyError:
 | |
|             tarinfo = None
 | |
|         self.assert_(tarinfo is not None, "longlink not found")
 | |
|         self.assert_(tarinfo.linkname == name, "linkname wrong")
 | |
| 
 | |
|     def test_truncated_longname(self):
 | |
|         f = open(tarname())
 | |
|         fobj = StringIO.StringIO(f.read(1024))
 | |
|         f.close()
 | |
|         tar = tarfile.open(name="foo.tar", fileobj=fobj)
 | |
|         self.assert_(len(tar.getmembers()) == 0, "")
 | |
|         tar.close()
 | |
| 
 | |
| 
 | |
| class ExtractHardlinkTest(BaseTest):
 | |
| 
 | |
|     def test_hardlink(self):
 | |
|         """Test hardlink extraction (bug #857297)
 | |
|         """
 | |
|         # Prevent errors from being caught
 | |
|         self.tar.errorlevel = 1
 | |
| 
 | |
|         self.tar.extract("0-REGTYPE", dirname())
 | |
|         try:
 | |
|             # Extract 1-LNKTYPE which is a hardlink to 0-REGTYPE
 | |
|             self.tar.extract("1-LNKTYPE", dirname())
 | |
|         except EnvironmentError as e:
 | |
|             import errno
 | |
|             if e.errno == errno.ENOENT:
 | |
|                 self.fail("hardlink not extracted properly")
 | |
| 
 | |
| class CreateHardlinkTest(BaseTest):
 | |
|     """Test the creation of LNKTYPE (hardlink) members in an archive.
 | |
|        In this respect tarfile.py mimics the behaviour of GNU tar: If
 | |
|        a file has a st_nlink > 1, it will be added a REGTYPE member
 | |
|        only the first time.
 | |
|     """
 | |
| 
 | |
|     def setUp(self):
 | |
|         self.tar = tarfile.open(tmpname(), "w")
 | |
| 
 | |
|         self.foo = os.path.join(dirname(), "foo")
 | |
|         self.bar = os.path.join(dirname(), "bar")
 | |
| 
 | |
|         if os.path.exists(self.foo):
 | |
|             os.remove(self.foo)
 | |
|         if os.path.exists(self.bar):
 | |
|             os.remove(self.bar)
 | |
| 
 | |
|         f = open(self.foo, "w")
 | |
|         f.write("foo")
 | |
|         f.close()
 | |
|         self.tar.add(self.foo)
 | |
| 
 | |
|     def test_add_twice(self):
 | |
|         # If st_nlink == 1 then the same file will be added as
 | |
|         # REGTYPE every time.
 | |
|         tarinfo = self.tar.gettarinfo(self.foo)
 | |
|         self.assertEqual(tarinfo.type, tarfile.REGTYPE,
 | |
|                 "add file as regular failed")
 | |
| 
 | |
|     def test_add_hardlink(self):
 | |
|         # If st_nlink > 1 then the same file will be added as
 | |
|         # LNKTYPE.
 | |
|         os.link(self.foo, self.bar)
 | |
|         tarinfo = self.tar.gettarinfo(self.foo)
 | |
|         self.assertEqual(tarinfo.type, tarfile.LNKTYPE,
 | |
|                 "add file as hardlink failed")
 | |
| 
 | |
|         tarinfo = self.tar.gettarinfo(self.bar)
 | |
|         self.assertEqual(tarinfo.type, tarfile.LNKTYPE,
 | |
|                 "add file as hardlink failed")
 | |
| 
 | |
|     def test_dereference_hardlink(self):
 | |
|         self.tar.dereference = True
 | |
|         os.link(self.foo, self.bar)
 | |
|         tarinfo = self.tar.gettarinfo(self.bar)
 | |
|         self.assertEqual(tarinfo.type, tarfile.REGTYPE,
 | |
|                 "dereferencing hardlink failed")
 | |
| 
 | |
| 
 | |
| # Gzip TestCases
 | |
| class ReadTestGzip(ReadTest):
 | |
|     comp = "gz"
 | |
| class ReadStreamTestGzip(ReadStreamTest):
 | |
|     comp = "gz"
 | |
| class WriteTestGzip(WriteTest):
 | |
|     comp = "gz"
 | |
| class WriteStreamTestGzip(WriteStreamTest):
 | |
|     comp = "gz"
 | |
| class ReadDetectTestGzip(ReadDetectTest):
 | |
|     comp = "gz"
 | |
| class ReadDetectFileobjTestGzip(ReadDetectFileobjTest):
 | |
|     comp = "gz"
 | |
| class ReadAsteriskTestGzip(ReadAsteriskTest):
 | |
|     comp = "gz"
 | |
| class ReadStreamAsteriskTestGzip(ReadStreamAsteriskTest):
 | |
|     comp = "gz"
 | |
| 
 | |
| # Filemode test cases
 | |
| 
 | |
| class FileModeTest(unittest.TestCase):
 | |
|     def test_modes(self):
 | |
|         self.assertEqual(tarfile.filemode(0755), '-rwxr-xr-x')
 | |
|         self.assertEqual(tarfile.filemode(07111), '---s--s--t')
 | |
| 
 | |
| class HeaderErrorTest(unittest.TestCase):
 | |
| 
 | |
|     def test_truncated_header(self):
 | |
|         self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "")
 | |
|         self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "filename\0")
 | |
|         self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "\0" * 511)
 | |
|         self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "\0" * 513)
 | |
| 
 | |
|     def test_empty_header(self):
 | |
|         self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, "\0" * 512)
 | |
| 
 | |
|     def test_invalid_header(self):
 | |
|         buf = tarfile.TarInfo("filename").tobuf()
 | |
|         buf = buf[:148] + "foo\0\0\0\0\0" + buf[156:] # invalid number field.
 | |
|         self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, buf)
 | |
| 
 | |
|     def test_bad_checksum(self):
 | |
|         buf = tarfile.TarInfo("filename").tobuf()
 | |
|         b = buf[:148] + "        " + buf[156:] # clear the checksum field.
 | |
|         self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, b)
 | |
|         b = "a" + buf[1:] # manipulate the buffer, so checksum won't match.
 | |
|         self.assertRaises(tarfile.HeaderError, tarfile.TarInfo.frombuf, b)
 | |
| 
 | |
| class OpenFileobjTest(BaseTest):
 | |
|     # Test for SF bug #1496501.
 | |
| 
 | |
|     def test_opener(self):
 | |
|         fobj = StringIO.StringIO("foo\n")
 | |
|         try:
 | |
|             tarfile.open("", "r", fileobj=fobj)
 | |
|         except tarfile.ReadError:
 | |
|             self.assertEqual(fobj.tell(), 0, "fileobj's position has moved")
 | |
| 
 | |
| if bz2:
 | |
|     # Bzip2 TestCases
 | |
|     class ReadTestBzip2(ReadTestGzip):
 | |
|         comp = "bz2"
 | |
|     class ReadStreamTestBzip2(ReadStreamTestGzip):
 | |
|         comp = "bz2"
 | |
|     class WriteTestBzip2(WriteTest):
 | |
|         comp = "bz2"
 | |
|     class WriteStreamTestBzip2(WriteStreamTestGzip):
 | |
|         comp = "bz2"
 | |
|     class ReadDetectTestBzip2(ReadDetectTest):
 | |
|         comp = "bz2"
 | |
|     class ReadDetectFileobjTestBzip2(ReadDetectFileobjTest):
 | |
|         comp = "bz2"
 | |
|     class ReadAsteriskTestBzip2(ReadAsteriskTest):
 | |
|         comp = "bz2"
 | |
|     class ReadStreamAsteriskTestBzip2(ReadStreamAsteriskTest):
 | |
|         comp = "bz2"
 | |
| 
 | |
| # If importing gzip failed, discard the Gzip TestCases.
 | |
| if not gzip:
 | |
|     del ReadTestGzip
 | |
|     del ReadStreamTestGzip
 | |
|     del WriteTestGzip
 | |
|     del WriteStreamTestGzip
 | |
| 
 | |
| def test_main():
 | |
|     # Create archive.
 | |
|     f = open(tarname(), "rb")
 | |
|     fguts = f.read()
 | |
|     f.close()
 | |
|     if gzip:
 | |
|         # create testtar.tar.gz
 | |
|         tar = gzip.open(tarname("gz"), "wb")
 | |
|         tar.write(fguts)
 | |
|         tar.close()
 | |
|     if bz2:
 | |
|         # create testtar.tar.bz2
 | |
|         tar = bz2.BZ2File(tarname("bz2"), "wb")
 | |
|         tar.write(fguts)
 | |
|         tar.close()
 | |
| 
 | |
|     tests = [
 | |
|         FileModeTest,
 | |
|         HeaderErrorTest,
 | |
|         OpenFileobjTest,
 | |
|         ReadTest,
 | |
|         ReadStreamTest,
 | |
|         ReadDetectTest,
 | |
|         ReadDetectFileobjTest,
 | |
|         ReadAsteriskTest,
 | |
|         ReadStreamAsteriskTest,
 | |
|         WriteTest,
 | |
|         AppendTest,
 | |
|         Write100Test,
 | |
|         WriteSize0Test,
 | |
|         WriteStreamTest,
 | |
|         WriteGNULongTest,
 | |
|         ReadGNULongTest,
 | |
|     ]
 | |
| 
 | |
|     if hasattr(os, "link"):
 | |
|         tests.append(ExtractHardlinkTest)
 | |
|         tests.append(CreateHardlinkTest)
 | |
| 
 | |
|     if gzip:
 | |
|         tests.extend([
 | |
|             ReadTestGzip, ReadStreamTestGzip,
 | |
|             WriteTestGzip, WriteStreamTestGzip,
 | |
|             ReadDetectTestGzip, ReadDetectFileobjTestGzip,
 | |
|             ReadAsteriskTestGzip, ReadStreamAsteriskTestGzip
 | |
|         ])
 | |
| 
 | |
|     if bz2:
 | |
|         tests.extend([
 | |
|             ReadTestBzip2, ReadStreamTestBzip2,
 | |
|             WriteTestBzip2, WriteStreamTestBzip2,
 | |
|             ReadDetectTestBzip2, ReadDetectFileobjTestBzip2,
 | |
|             ReadAsteriskTestBzip2, ReadStreamAsteriskTestBzip2
 | |
|         ])
 | |
|     try:
 | |
|         test_support.run_unittest(*tests)
 | |
|     finally:
 | |
|         if gzip:
 | |
|             os.remove(tarname("gz"))
 | |
|         if bz2:
 | |
|             os.remove(tarname("bz2"))
 | |
|         if os.path.exists(dirname()):
 | |
|             shutil.rmtree(dirname())
 | |
|         if os.path.exists(tmpname()):
 | |
|             os.remove(tmpname())
 | |
| 
 | |
| if __name__ == "__main__":
 | |
|     test_main()
 |