mirror of
https://github.com/python/cpython.git
synced 2025-10-26 03:04:41 +00:00
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
1104 lines
36 KiB
Python
1104 lines
36 KiB
Python
# -*- coding: iso-8859-15 -*-
|
||
|
||
import sys
|
||
import os
|
||
import shutil
|
||
import tempfile
|
||
import StringIO
|
||
from hashlib import md5
|
||
import errno
|
||
|
||
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 md5sum(data):
|
||
return md5(data).hexdigest()
|
||
|
||
def path(path):
|
||
return test_support.findfile(path)
|
||
|
||
TEMPDIR = os.path.join(tempfile.gettempdir(), "test_tarfile_tmp")
|
||
tarname = path("testtar.tar")
|
||
gzipname = os.path.join(TEMPDIR, "testtar.tar.gz")
|
||
bz2name = os.path.join(TEMPDIR, "testtar.tar.bz2")
|
||
tmpname = os.path.join(TEMPDIR, "tmp.tar")
|
||
|
||
md5_regtype = "65f477c818ad9e15f7feab0c6d37742f"
|
||
md5_sparse = "a54fbc4ca4f4399a90e1b27164012fc6"
|
||
|
||
|
||
class ReadTest(unittest.TestCase):
|
||
|
||
tarname = tarname
|
||
mode = "r:"
|
||
|
||
def setUp(self):
|
||
self.tar = tarfile.open(self.tarname, mode=self.mode, encoding="iso8859-1")
|
||
|
||
def tearDown(self):
|
||
self.tar.close()
|
||
|
||
|
||
class UstarReadTest(ReadTest):
|
||
|
||
def test_fileobj_regular_file(self):
|
||
tarinfo = self.tar.getmember("ustar/regtype")
|
||
fobj = self.tar.extractfile(tarinfo)
|
||
data = fobj.read()
|
||
self.assert_((len(data), md5sum(data)) == (tarinfo.size, md5_regtype),
|
||
"regular file extraction failed")
|
||
|
||
def test_fileobj_readlines(self):
|
||
self.tar.extract("ustar/regtype", TEMPDIR)
|
||
tarinfo = self.tar.getmember("ustar/regtype")
|
||
fobj1 = open(os.path.join(TEMPDIR, "ustar/regtype"), "rU")
|
||
fobj2 = self.tar.extractfile(tarinfo)
|
||
|
||
lines1 = fobj1.readlines()
|
||
lines2 = fobj2.readlines()
|
||
self.assert_(lines1 == lines2,
|
||
"fileobj.readlines() failed")
|
||
self.assert_(len(lines2) == 114,
|
||
"fileobj.readlines() failed")
|
||
self.assert_(lines2[83] == \
|
||
"I will gladly admit that Python is not the fastest running scripting language.\n",
|
||
"fileobj.readlines() failed")
|
||
|
||
def test_fileobj_iter(self):
|
||
self.tar.extract("ustar/regtype", TEMPDIR)
|
||
tarinfo = self.tar.getmember("ustar/regtype")
|
||
fobj1 = open(os.path.join(TEMPDIR, "ustar/regtype"), "rU")
|
||
fobj2 = self.tar.extractfile(tarinfo)
|
||
lines1 = fobj1.readlines()
|
||
lines2 = [line for line in fobj2]
|
||
self.assert_(lines1 == lines2,
|
||
"fileobj.__iter__() failed")
|
||
|
||
def test_fileobj_seek(self):
|
||
self.tar.extract("ustar/regtype", TEMPDIR)
|
||
fobj = open(os.path.join(TEMPDIR, "ustar/regtype"), "rb")
|
||
data = fobj.read()
|
||
fobj.close()
|
||
|
||
tarinfo = self.tar.getmember("ustar/regtype")
|
||
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()
|
||
|
||
|
||
class MiscReadTest(ReadTest):
|
||
|
||
def test_no_filename(self):
|
||
fobj = open(self.tarname, "rb")
|
||
tar = tarfile.open(fileobj=fobj, mode=self.mode)
|
||
self.assertEqual(tar.name, os.path.abspath(fobj.name))
|
||
|
||
def test_fail_comp(self):
|
||
# For Gzip and Bz2 Tests: fail with a ReadError on an uncompressed file.
|
||
if self.mode == "r:":
|
||
return
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, tarname, self.mode)
|
||
fobj = open(tarname, "rb")
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, fileobj=fobj, mode=self.mode)
|
||
|
||
def test_v7_dirtype(self):
|
||
# Test old style dirtype member (bug #1336623):
|
||
# Old V7 tars create directory members using an AREGTYPE
|
||
# header with a "/" appended to the filename field.
|
||
tarinfo = self.tar.getmember("misc/dirtype-old-v7")
|
||
self.assert_(tarinfo.type == tarfile.DIRTYPE,
|
||
"v7 dirtype failed")
|
||
|
||
def test_check_members(self):
|
||
for tarinfo in self.tar:
|
||
self.assert_(int(tarinfo.mtime) == 0o7606136617,
|
||
"wrong mtime for %s" % tarinfo.name)
|
||
if not tarinfo.name.startswith("ustar/"):
|
||
continue
|
||
self.assert_(tarinfo.uname == "tarfile",
|
||
"wrong uname for %s" % tarinfo.name)
|
||
|
||
def test_find_members(self):
|
||
self.assert_(self.tar.getmembers()[-1].name == "misc/eof",
|
||
"could not find all members")
|
||
|
||
def test_extract_hardlink(self):
|
||
# Test hardlink extraction (e.g. bug #857297).
|
||
tar = tarfile.open(tarname, errorlevel=1, encoding="iso8859-1")
|
||
|
||
tar.extract("ustar/regtype", TEMPDIR)
|
||
try:
|
||
tar.extract("ustar/lnktype", TEMPDIR)
|
||
except EnvironmentError as e:
|
||
if e.errno == errno.ENOENT:
|
||
self.fail("hardlink not extracted properly")
|
||
|
||
data = open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb").read()
|
||
self.assertEqual(md5sum(data), md5_regtype)
|
||
|
||
try:
|
||
tar.extract("ustar/symtype", TEMPDIR)
|
||
except EnvironmentError as e:
|
||
if e.errno == errno.ENOENT:
|
||
self.fail("symlink not extracted properly")
|
||
|
||
data = open(os.path.join(TEMPDIR, "ustar/symtype"), "rb").read()
|
||
self.assertEqual(md5sum(data), md5_regtype)
|
||
|
||
|
||
class StreamReadTest(ReadTest):
|
||
|
||
mode="r|"
|
||
|
||
def test_fileobj_regular_file(self):
|
||
tarinfo = self.tar.next() # get "regtype" (can't use getmember)
|
||
fobj = self.tar.extractfile(tarinfo)
|
||
data = fobj.read()
|
||
self.assert_((len(data), md5sum(data)) == (tarinfo.size, md5_regtype),
|
||
"regular file extraction failed")
|
||
|
||
def test_provoke_stream_error(self):
|
||
tarinfos = self.tar.getmembers()
|
||
f = self.tar.extractfile(tarinfos[0]) # read the first member
|
||
self.assertRaises(tarfile.StreamError, f.read)
|
||
|
||
def test_compare_members(self):
|
||
tar1 = tarfile.open(tarname, encoding="iso8859-1")
|
||
tar2 = self.tar
|
||
|
||
while True:
|
||
t1 = tar1.next()
|
||
t2 = tar2.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, tar2.extractfile, t2)
|
||
continue
|
||
|
||
v1 = tar1.extractfile(t1)
|
||
v2 = tar2.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")
|
||
|
||
tar1.close()
|
||
|
||
|
||
class DetectReadTest(unittest.TestCase):
|
||
|
||
def _testfunc_file(self, name, mode):
|
||
try:
|
||
tarfile.open(name, mode)
|
||
except tarfile.ReadError:
|
||
self.fail()
|
||
|
||
def _testfunc_fileobj(self, name, mode):
|
||
try:
|
||
tarfile.open(name, mode, fileobj=open(name, "rb"))
|
||
except tarfile.ReadError:
|
||
self.fail()
|
||
|
||
def _test_modes(self, testfunc):
|
||
testfunc(tarname, "r")
|
||
testfunc(tarname, "r:")
|
||
testfunc(tarname, "r:*")
|
||
testfunc(tarname, "r|")
|
||
testfunc(tarname, "r|*")
|
||
|
||
if gzip:
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, tarname, mode="r:gz")
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, tarname, mode="r|gz")
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, gzipname, mode="r:")
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, gzipname, mode="r|")
|
||
|
||
testfunc(gzipname, "r")
|
||
testfunc(gzipname, "r:*")
|
||
testfunc(gzipname, "r:gz")
|
||
testfunc(gzipname, "r|*")
|
||
testfunc(gzipname, "r|gz")
|
||
|
||
if bz2:
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, tarname, mode="r:bz2")
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, tarname, mode="r|bz2")
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, bz2name, mode="r:")
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, bz2name, mode="r|")
|
||
|
||
testfunc(bz2name, "r")
|
||
testfunc(bz2name, "r:*")
|
||
testfunc(bz2name, "r:bz2")
|
||
testfunc(bz2name, "r|*")
|
||
testfunc(bz2name, "r|bz2")
|
||
|
||
def test_detect_file(self):
|
||
self._test_modes(self._testfunc_file)
|
||
|
||
def test_detect_fileobj(self):
|
||
self._test_modes(self._testfunc_fileobj)
|
||
|
||
|
||
class MemberReadTest(ReadTest):
|
||
|
||
def _test_member(self, tarinfo, chksum=None, **kwargs):
|
||
if chksum is not None:
|
||
self.assert_(md5sum(self.tar.extractfile(tarinfo).read()) == chksum,
|
||
"wrong md5sum for %s" % tarinfo.name)
|
||
|
||
kwargs["mtime"] = 0o7606136617
|
||
kwargs["uid"] = 1000
|
||
kwargs["gid"] = 100
|
||
if "old-v7" not in tarinfo.name:
|
||
# V7 tar can't handle alphabetic owners.
|
||
kwargs["uname"] = "tarfile"
|
||
kwargs["gname"] = "tarfile"
|
||
for k, v in kwargs.items():
|
||
self.assert_(getattr(tarinfo, k) == v,
|
||
"wrong value in %s field of %s" % (k, tarinfo.name))
|
||
|
||
def test_find_regtype(self):
|
||
tarinfo = self.tar.getmember("ustar/regtype")
|
||
self._test_member(tarinfo, size=7011, chksum=md5_regtype)
|
||
|
||
def test_find_conttype(self):
|
||
tarinfo = self.tar.getmember("ustar/conttype")
|
||
self._test_member(tarinfo, size=7011, chksum=md5_regtype)
|
||
|
||
def test_find_dirtype(self):
|
||
tarinfo = self.tar.getmember("ustar/dirtype")
|
||
self._test_member(tarinfo, size=0)
|
||
|
||
def test_find_dirtype_with_size(self):
|
||
tarinfo = self.tar.getmember("ustar/dirtype-with-size")
|
||
self._test_member(tarinfo, size=255)
|
||
|
||
def test_find_lnktype(self):
|
||
tarinfo = self.tar.getmember("ustar/lnktype")
|
||
self._test_member(tarinfo, size=0, linkname="ustar/regtype")
|
||
|
||
def test_find_symtype(self):
|
||
tarinfo = self.tar.getmember("ustar/symtype")
|
||
self._test_member(tarinfo, size=0, linkname="regtype")
|
||
|
||
def test_find_blktype(self):
|
||
tarinfo = self.tar.getmember("ustar/blktype")
|
||
self._test_member(tarinfo, size=0, devmajor=3, devminor=0)
|
||
|
||
def test_find_chrtype(self):
|
||
tarinfo = self.tar.getmember("ustar/chrtype")
|
||
self._test_member(tarinfo, size=0, devmajor=1, devminor=3)
|
||
|
||
def test_find_fifotype(self):
|
||
tarinfo = self.tar.getmember("ustar/fifotype")
|
||
self._test_member(tarinfo, size=0)
|
||
|
||
def test_find_sparse(self):
|
||
tarinfo = self.tar.getmember("ustar/sparse")
|
||
self._test_member(tarinfo, size=86016, chksum=md5_sparse)
|
||
|
||
def test_find_umlauts(self):
|
||
tarinfo = self.tar.getmember("ustar/umlauts-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")
|
||
self._test_member(tarinfo, size=7011, chksum=md5_regtype)
|
||
|
||
def test_find_ustar_longname(self):
|
||
name = "ustar/" + "12345/" * 39 + "1234567/longname"
|
||
self.assert_(name in self.tar.getnames())
|
||
|
||
def test_find_regtype_oldv7(self):
|
||
tarinfo = self.tar.getmember("misc/regtype-old-v7")
|
||
self._test_member(tarinfo, size=7011, chksum=md5_regtype)
|
||
|
||
def test_find_pax_umlauts(self):
|
||
self.tar = tarfile.open(self.tarname, mode=self.mode, encoding="iso8859-1")
|
||
tarinfo = self.tar.getmember("pax/umlauts-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")
|
||
self._test_member(tarinfo, size=7011, chksum=md5_regtype)
|
||
|
||
|
||
class LongnameTest(ReadTest):
|
||
|
||
def test_read_longname(self):
|
||
# Test reading of longname (bug #1471427).
|
||
longname = self.subdir + "/" + "123/" * 125 + "longname"
|
||
try:
|
||
tarinfo = self.tar.getmember(longname)
|
||
except KeyError:
|
||
self.fail("longname not found")
|
||
self.assert_(tarinfo.type != tarfile.DIRTYPE, "read longname as dirtype")
|
||
|
||
def test_read_longlink(self):
|
||
longname = self.subdir + "/" + "123/" * 125 + "longname"
|
||
longlink = self.subdir + "/" + "123/" * 125 + "longlink"
|
||
try:
|
||
tarinfo = self.tar.getmember(longlink)
|
||
except KeyError:
|
||
self.fail("longlink not found")
|
||
self.assert_(tarinfo.linkname == longname, "linkname wrong")
|
||
|
||
def test_truncated_longname(self):
|
||
longname = self.subdir + "/" + "123/" * 125 + "longname"
|
||
tarinfo = self.tar.getmember(longname)
|
||
offset = tarinfo.offset
|
||
self.tar.fileobj.seek(offset)
|
||
fobj = StringIO.StringIO(self.tar.fileobj.read(3 * 512))
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, name="foo.tar", fileobj=fobj)
|
||
|
||
def test_header_offset(self):
|
||
# Test if the start offset of the TarInfo object includes
|
||
# the preceding extended header.
|
||
longname = self.subdir + "/" + "123/" * 125 + "longname"
|
||
offset = self.tar.getmember(longname).offset
|
||
fobj = open(tarname)
|
||
fobj.seek(offset)
|
||
tarinfo = tarfile.TarInfo.frombuf(fobj.read(512))
|
||
self.assertEqual(tarinfo.type, self.longnametype)
|
||
|
||
|
||
class GNUReadTest(LongnameTest):
|
||
|
||
subdir = "gnu"
|
||
longnametype = tarfile.GNUTYPE_LONGNAME
|
||
|
||
def test_sparse_file(self):
|
||
tarinfo1 = self.tar.getmember("ustar/sparse")
|
||
fobj1 = self.tar.extractfile(tarinfo1)
|
||
tarinfo2 = self.tar.getmember("gnu/sparse")
|
||
fobj2 = self.tar.extractfile(tarinfo2)
|
||
self.assert_(fobj1.read() == fobj2.read(),
|
||
"sparse file extraction failed")
|
||
|
||
|
||
class PaxReadTest(LongnameTest):
|
||
|
||
subdir = "pax"
|
||
longnametype = tarfile.XHDTYPE
|
||
|
||
def test_pax_global_headers(self):
|
||
tar = tarfile.open(tarname, encoding="iso8859-1")
|
||
|
||
tarinfo = tar.getmember("pax/regtype1")
|
||
self.assertEqual(tarinfo.uname, "foo")
|
||
self.assertEqual(tarinfo.gname, "bar")
|
||
self.assertEqual(tarinfo.pax_headers.get("VENDOR.umlauts"), "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")
|
||
|
||
tarinfo = tar.getmember("pax/regtype2")
|
||
self.assertEqual(tarinfo.uname, "")
|
||
self.assertEqual(tarinfo.gname, "bar")
|
||
self.assertEqual(tarinfo.pax_headers.get("VENDOR.umlauts"), "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")
|
||
|
||
tarinfo = tar.getmember("pax/regtype3")
|
||
self.assertEqual(tarinfo.uname, "tarfile")
|
||
self.assertEqual(tarinfo.gname, "tarfile")
|
||
self.assertEqual(tarinfo.pax_headers.get("VENDOR.umlauts"), "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")
|
||
|
||
def test_pax_number_fields(self):
|
||
# All following number fields are read from the pax header.
|
||
tar = tarfile.open(tarname, encoding="iso8859-1")
|
||
tarinfo = tar.getmember("pax/regtype4")
|
||
self.assertEqual(tarinfo.size, 7011)
|
||
self.assertEqual(tarinfo.uid, 123)
|
||
self.assertEqual(tarinfo.gid, 123)
|
||
self.assertEqual(tarinfo.mtime, 1041808783.0)
|
||
self.assertEqual(type(tarinfo.mtime), float)
|
||
self.assertEqual(float(tarinfo.pax_headers["atime"]), 1041808783.0)
|
||
self.assertEqual(float(tarinfo.pax_headers["ctime"]), 1041808783.0)
|
||
|
||
|
||
class WriteTest(unittest.TestCase):
|
||
|
||
mode = "w:"
|
||
|
||
def test_100_char_name(self):
|
||
# 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'.
|
||
name = "0123456789" * 10
|
||
tar = tarfile.open(tmpname, self.mode)
|
||
t = tarfile.TarInfo(name)
|
||
tar.addfile(t)
|
||
tar.close()
|
||
|
||
tar = tarfile.open(tmpname)
|
||
self.assert_(tar.getnames()[0] == name,
|
||
"failed to store 100 char filename")
|
||
tar.close()
|
||
|
||
def test_tar_size(self):
|
||
# Test for bug #1013882.
|
||
tar = tarfile.open(tmpname, self.mode)
|
||
path = os.path.join(TEMPDIR, "file")
|
||
fobj = open(path, "wb")
|
||
fobj.write("aaa")
|
||
fobj.close()
|
||
tar.add(path)
|
||
tar.close()
|
||
self.assert_(os.path.getsize(tmpname) > 0,
|
||
"tarfile is empty")
|
||
|
||
# The test_*_size tests test for bug #1167128.
|
||
def test_file_size(self):
|
||
tar = tarfile.open(tmpname, self.mode)
|
||
|
||
path = os.path.join(TEMPDIR, "file")
|
||
fobj = open(path, "wb")
|
||
fobj.close()
|
||
tarinfo = tar.gettarinfo(path)
|
||
self.assertEqual(tarinfo.size, 0)
|
||
|
||
fobj = open(path, "wb")
|
||
fobj.write("aaa")
|
||
fobj.close()
|
||
tarinfo = tar.gettarinfo(path)
|
||
self.assertEqual(tarinfo.size, 3)
|
||
|
||
tar.close()
|
||
|
||
def test_directory_size(self):
|
||
path = os.path.join(TEMPDIR, "directory")
|
||
os.mkdir(path)
|
||
try:
|
||
tar = tarfile.open(tmpname, self.mode)
|
||
tarinfo = tar.gettarinfo(path)
|
||
self.assertEqual(tarinfo.size, 0)
|
||
finally:
|
||
os.rmdir(path)
|
||
|
||
def test_link_size(self):
|
||
if hasattr(os, "link"):
|
||
link = os.path.join(TEMPDIR, "link")
|
||
target = os.path.join(TEMPDIR, "link_target")
|
||
open(target, "wb").close()
|
||
os.link(target, link)
|
||
try:
|
||
tar = tarfile.open(tmpname, self.mode)
|
||
tarinfo = tar.gettarinfo(link)
|
||
self.assertEqual(tarinfo.size, 0)
|
||
finally:
|
||
os.remove(target)
|
||
os.remove(link)
|
||
|
||
def test_symlink_size(self):
|
||
if hasattr(os, "symlink"):
|
||
path = os.path.join(TEMPDIR, "symlink")
|
||
os.symlink("link_target", path)
|
||
try:
|
||
tar = tarfile.open(tmpname, self.mode)
|
||
tarinfo = tar.gettarinfo(path)
|
||
self.assertEqual(tarinfo.size, 0)
|
||
finally:
|
||
os.remove(path)
|
||
|
||
def test_add_self(self):
|
||
# Test for #1257255.
|
||
dstname = os.path.abspath(tmpname)
|
||
|
||
tar = tarfile.open(tmpname, self.mode)
|
||
self.assert_(tar.name == dstname, "archive name must be absolute")
|
||
|
||
tar.add(dstname)
|
||
self.assert_(tar.getnames() == [], "added the archive to itself")
|
||
|
||
cwd = os.getcwd()
|
||
os.chdir(TEMPDIR)
|
||
tar.add(dstname)
|
||
os.chdir(cwd)
|
||
self.assert_(tar.getnames() == [], "added the archive to itself")
|
||
|
||
|
||
class StreamWriteTest(unittest.TestCase):
|
||
|
||
mode = "w|"
|
||
|
||
def test_stream_padding(self):
|
||
# Test for bug #1543303.
|
||
tar = tarfile.open(tmpname, self.mode)
|
||
tar.close()
|
||
|
||
if self.mode.endswith("gz"):
|
||
fobj = gzip.GzipFile(tmpname)
|
||
data = fobj.read()
|
||
fobj.close()
|
||
elif self.mode.endswith("bz2"):
|
||
dec = bz2.BZ2Decompressor()
|
||
data = open(tmpname, "rb").read()
|
||
data = dec.decompress(data)
|
||
self.assert_(len(dec.unused_data) == 0,
|
||
"found trailing data")
|
||
else:
|
||
fobj = open(tmpname, "rb")
|
||
data = fobj.read()
|
||
fobj.close()
|
||
|
||
self.assert_(data.count("\0") == tarfile.RECORDSIZE,
|
||
"incorrect zero padding")
|
||
|
||
|
||
class GNUWriteTest(unittest.TestCase):
|
||
# This testcase checks for correct creation of GNU Longname
|
||
# and Longlink extended headers (cp. bug #812325).
|
||
|
||
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.format = tarfile.GNU_FORMAT
|
||
tar.addfile(tarinfo)
|
||
|
||
v1 = self._calc_size(name, link)
|
||
v2 = tar.offset
|
||
self.assert_(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 HardlinkTest(unittest.TestCase):
|
||
# Test the creation of LNKTYPE (hardlink) members in an archive.
|
||
|
||
def setUp(self):
|
||
self.foo = os.path.join(TEMPDIR, "foo")
|
||
self.bar = os.path.join(TEMPDIR, "bar")
|
||
|
||
fobj = open(self.foo, "wb")
|
||
fobj.write("foo")
|
||
fobj.close()
|
||
|
||
os.link(self.foo, self.bar)
|
||
|
||
self.tar = tarfile.open(tmpname, "w")
|
||
self.tar.add(self.foo)
|
||
|
||
def tearDown(self):
|
||
os.remove(self.foo)
|
||
os.remove(self.bar)
|
||
|
||
def test_add_twice(self):
|
||
# The same name will be added as a REGTYPE every
|
||
# time regardless of st_nlink.
|
||
tarinfo = self.tar.gettarinfo(self.foo)
|
||
self.assert_(tarinfo.type == tarfile.REGTYPE,
|
||
"add file as regular failed")
|
||
|
||
def test_add_hardlink(self):
|
||
tarinfo = self.tar.gettarinfo(self.bar)
|
||
self.assert_(tarinfo.type == tarfile.LNKTYPE,
|
||
"add file as hardlink failed")
|
||
|
||
def test_dereference_hardlink(self):
|
||
self.tar.dereference = True
|
||
tarinfo = self.tar.gettarinfo(self.bar)
|
||
self.assert_(tarinfo.type == tarfile.REGTYPE,
|
||
"dereferencing hardlink failed")
|
||
|
||
|
||
class PaxWriteTest(GNUWriteTest):
|
||
|
||
def _test(self, name, link=None):
|
||
# See GNUWriteTest.
|
||
tarinfo = tarfile.TarInfo(name)
|
||
if link:
|
||
tarinfo.linkname = link
|
||
tarinfo.type = tarfile.LNKTYPE
|
||
|
||
tar = tarfile.open(tmpname, "w", format=tarfile.PAX_FORMAT)
|
||
tar.addfile(tarinfo)
|
||
tar.close()
|
||
|
||
tar = tarfile.open(tmpname)
|
||
if link:
|
||
l = tar.getmembers()[0].linkname
|
||
self.assert_(link == l, "PAX longlink creation failed")
|
||
else:
|
||
n = tar.getmembers()[0].name
|
||
self.assert_(name == n, "PAX longname creation failed")
|
||
|
||
def test_pax_global_header(self):
|
||
pax_headers = {
|
||
"foo": "bar",
|
||
"uid": "0",
|
||
"mtime": "1.23",
|
||
"test": "<EFBFBD><EFBFBD><EFBFBD>",
|
||
"<EFBFBD><EFBFBD><EFBFBD>": "test"}
|
||
|
||
tar = tarfile.open(tmpname, "w", format=tarfile.PAX_FORMAT, \
|
||
pax_headers=pax_headers)
|
||
tar.addfile(tarfile.TarInfo("test"))
|
||
tar.close()
|
||
|
||
# Test if the global header was written correctly.
|
||
tar = tarfile.open(tmpname, encoding="iso8859-1")
|
||
self.assertEqual(tar.pax_headers, pax_headers)
|
||
self.assertEqual(tar.getmembers()[0].pax_headers, pax_headers)
|
||
|
||
# Test if all the fields are unicode.
|
||
for key, val in tar.pax_headers.items():
|
||
self.assert_(type(key) is unicode)
|
||
self.assert_(type(val) is unicode)
|
||
if key in tarfile.PAX_NUMBER_FIELDS:
|
||
try:
|
||
tarfile.PAX_NUMBER_FIELDS[key](val)
|
||
except (TypeError, ValueError):
|
||
self.fail("unable to convert pax header field")
|
||
|
||
def test_pax_extended_header(self):
|
||
# The fields from the pax header have priority over the
|
||
# TarInfo.
|
||
pax_headers = {"path": "foo", "uid": "123"}
|
||
|
||
tar = tarfile.open(tmpname, "w", format=tarfile.PAX_FORMAT, encoding="iso8859-1")
|
||
t = tarfile.TarInfo()
|
||
t.name = "<EFBFBD><EFBFBD><EFBFBD>" # non-ASCII
|
||
t.uid = 8**8 # too large
|
||
t.pax_headers = pax_headers
|
||
tar.addfile(t)
|
||
tar.close()
|
||
|
||
tar = tarfile.open(tmpname, encoding="iso8859-1")
|
||
t = tar.getmembers()[0]
|
||
self.assertEqual(t.pax_headers, pax_headers)
|
||
self.assertEqual(t.name, "foo")
|
||
self.assertEqual(t.uid, 123)
|
||
|
||
|
||
class UstarUnicodeTest(unittest.TestCase):
|
||
# All *UnicodeTests FIXME
|
||
|
||
format = tarfile.USTAR_FORMAT
|
||
|
||
def test_iso8859_1_filename(self):
|
||
self._test_unicode_filename("iso8859-1")
|
||
|
||
def test_utf7_filename(self):
|
||
self._test_unicode_filename("utf7")
|
||
|
||
def test_utf8_filename(self):
|
||
self._test_unicode_filename("utf8")
|
||
|
||
def _test_unicode_filename(self, encoding):
|
||
tar = tarfile.open(tmpname, "w", format=self.format, encoding=encoding, errors="strict")
|
||
name = "<EFBFBD><EFBFBD><EFBFBD>"
|
||
tar.addfile(tarfile.TarInfo(name))
|
||
tar.close()
|
||
|
||
tar = tarfile.open(tmpname, encoding=encoding)
|
||
self.assert_(type(tar.getnames()[0]) is not unicode)
|
||
self.assertEqual(tar.getmembers()[0].name, name.encode(encoding))
|
||
tar.close()
|
||
|
||
def test_unicode_filename_error(self):
|
||
tar = tarfile.open(tmpname, "w", format=self.format, encoding="ascii", errors="strict")
|
||
tarinfo = tarfile.TarInfo()
|
||
|
||
tarinfo.name = "<EFBFBD><EFBFBD><EFBFBD>"
|
||
if self.format == tarfile.PAX_FORMAT:
|
||
self.assertRaises(UnicodeError, tar.addfile, tarinfo)
|
||
else:
|
||
tar.addfile(tarinfo)
|
||
|
||
tarinfo.name = "<EFBFBD><EFBFBD><EFBFBD>"
|
||
self.assertRaises(UnicodeError, tar.addfile, tarinfo)
|
||
|
||
tarinfo.name = "foo"
|
||
tarinfo.uname = "<EFBFBD><EFBFBD><EFBFBD>"
|
||
self.assertRaises(UnicodeError, tar.addfile, tarinfo)
|
||
|
||
def test_unicode_argument(self):
|
||
tar = tarfile.open(tarname, "r", encoding="iso8859-1", errors="strict")
|
||
for t in tar:
|
||
self.assert_(type(t.name) is str)
|
||
self.assert_(type(t.linkname) is str)
|
||
self.assert_(type(t.uname) is str)
|
||
self.assert_(type(t.gname) is str)
|
||
tar.close()
|
||
|
||
def test_uname_unicode(self):
|
||
for name in ("<EFBFBD><EFBFBD><EFBFBD>", "<EFBFBD><EFBFBD><EFBFBD>"):
|
||
t = tarfile.TarInfo("foo")
|
||
t.uname = name
|
||
t.gname = name
|
||
|
||
fobj = StringIO.StringIO()
|
||
tar = tarfile.open("foo.tar", mode="w", fileobj=fobj, format=self.format, encoding="iso8859-1")
|
||
tar.addfile(t)
|
||
tar.close()
|
||
fobj.seek(0)
|
||
|
||
tar = tarfile.open("foo.tar", fileobj=fobj, encoding="iso8859-1")
|
||
t = tar.getmember("foo")
|
||
self.assertEqual(t.uname, "<EFBFBD><EFBFBD><EFBFBD>")
|
||
self.assertEqual(t.gname, "<EFBFBD><EFBFBD><EFBFBD>")
|
||
|
||
class GNUUnicodeTest(UstarUnicodeTest):
|
||
|
||
format = tarfile.GNU_FORMAT
|
||
|
||
|
||
class PaxUnicodeTest(UstarUnicodeTest):
|
||
|
||
format = tarfile.PAX_FORMAT
|
||
|
||
def _create_unicode_name(self, name):
|
||
tar = tarfile.open(tmpname, "w", format=self.format)
|
||
t = tarfile.TarInfo()
|
||
t.pax_headers["path"] = name
|
||
tar.addfile(t)
|
||
tar.close()
|
||
|
||
def test_error_handlers(self):
|
||
# Test if the unicode error handlers work correctly for characters
|
||
# that cannot be expressed in a given encoding.
|
||
self._create_unicode_name("<EFBFBD><EFBFBD><EFBFBD>")
|
||
|
||
for handler, name in (("utf-8", "<EFBFBD><EFBFBD><EFBFBD>".encode("utf8")),
|
||
("replace", "???"), ("ignore", "")):
|
||
tar = tarfile.open(tmpname, format=self.format, encoding="ascii",
|
||
errors=handler)
|
||
self.assertEqual(tar.getnames()[0], name)
|
||
|
||
self.assertRaises(UnicodeError, tarfile.open, tmpname,
|
||
encoding="ascii", errors="strict")
|
||
|
||
def test_error_handler_utf8(self):
|
||
# Create a pathname that has one component representable using
|
||
# iso8859-1 and the other only in iso8859-15.
|
||
self._create_unicode_name("<EFBFBD><EFBFBD><EFBFBD>/<2F>")
|
||
|
||
tar = tarfile.open(tmpname, format=self.format, encoding="iso8859-1",
|
||
errors="utf-8")
|
||
self.assertEqual(tar.getnames()[0], "<EFBFBD><EFBFBD><EFBFBD>/" + "<EFBFBD>".encode("utf8"))
|
||
|
||
|
||
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, mode="w:"):
|
||
src = tarfile.open(tarname, encoding="iso8859-1")
|
||
t = src.getmember("ustar/regtype")
|
||
t.name = "foo"
|
||
f = src.extractfile(t)
|
||
tar = tarfile.open(self.tarname, mode)
|
||
tar.addfile(t, f)
|
||
tar.close()
|
||
|
||
def _test(self, names=["bar"], fileobj=None):
|
||
tar = tarfile.open(self.tarname, fileobj=fileobj)
|
||
self.assertEqual(tar.getnames(), names)
|
||
|
||
def test_non_existing(self):
|
||
self._add_testfile()
|
||
self._test()
|
||
|
||
def test_empty(self):
|
||
open(self.tarname, "w").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).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"])
|
||
|
||
def test_append_gz(self):
|
||
if gzip is None:
|
||
return
|
||
self._create_testtar("w:gz")
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, tmpname, "a")
|
||
|
||
def test_append_bz2(self):
|
||
if bz2 is None:
|
||
return
|
||
self._create_testtar("w:bz2")
|
||
self.assertRaises(tarfile.ReadError, tarfile.open, tmpname, "a")
|
||
|
||
|
||
class LimitsTest(unittest.TestCase):
|
||
|
||
def test_ustar_limits(self):
|
||
# 100 char name
|
||
tarinfo = tarfile.TarInfo("0123456789" * 10)
|
||
tarinfo.tobuf(tarfile.USTAR_FORMAT)
|
||
|
||
# 101 char name that cannot be stored
|
||
tarinfo = tarfile.TarInfo("0123456789" * 10 + "0")
|
||
self.assertRaises(ValueError, tarinfo.tobuf, tarfile.USTAR_FORMAT)
|
||
|
||
# 256 char name with a slash at pos 156
|
||
tarinfo = tarfile.TarInfo("123/" * 62 + "longname")
|
||
tarinfo.tobuf(tarfile.USTAR_FORMAT)
|
||
|
||
# 256 char name that cannot be stored
|
||
tarinfo = tarfile.TarInfo("1234567/" * 31 + "longname")
|
||
self.assertRaises(ValueError, tarinfo.tobuf, tarfile.USTAR_FORMAT)
|
||
|
||
# 512 char name
|
||
tarinfo = tarfile.TarInfo("123/" * 126 + "longname")
|
||
self.assertRaises(ValueError, tarinfo.tobuf, tarfile.USTAR_FORMAT)
|
||
|
||
# 512 char linkname
|
||
tarinfo = tarfile.TarInfo("longlink")
|
||
tarinfo.linkname = "123/" * 126 + "longname"
|
||
self.assertRaises(ValueError, tarinfo.tobuf, tarfile.USTAR_FORMAT)
|
||
|
||
# uid > 8 digits
|
||
tarinfo = tarfile.TarInfo("name")
|
||
tarinfo.uid = 0o10000000
|
||
self.assertRaises(ValueError, tarinfo.tobuf, tarfile.USTAR_FORMAT)
|
||
|
||
def test_gnu_limits(self):
|
||
tarinfo = tarfile.TarInfo("123/" * 126 + "longname")
|
||
tarinfo.tobuf(tarfile.GNU_FORMAT)
|
||
|
||
tarinfo = tarfile.TarInfo("longlink")
|
||
tarinfo.linkname = "123/" * 126 + "longname"
|
||
tarinfo.tobuf(tarfile.GNU_FORMAT)
|
||
|
||
# uid >= 256 ** 7
|
||
tarinfo = tarfile.TarInfo("name")
|
||
tarinfo.uid = 0o4000000000000000000
|
||
self.assertRaises(ValueError, tarinfo.tobuf, tarfile.GNU_FORMAT)
|
||
|
||
def test_pax_limits(self):
|
||
tarinfo = tarfile.TarInfo("123/" * 126 + "longname")
|
||
tarinfo.tobuf(tarfile.PAX_FORMAT)
|
||
|
||
tarinfo = tarfile.TarInfo("longlink")
|
||
tarinfo.linkname = "123/" * 126 + "longname"
|
||
tarinfo.tobuf(tarfile.PAX_FORMAT)
|
||
|
||
tarinfo = tarfile.TarInfo("name")
|
||
tarinfo.uid = 0o4000000000000000000
|
||
tarinfo.tobuf(tarfile.PAX_FORMAT)
|
||
|
||
|
||
class GzipMiscReadTest(MiscReadTest):
|
||
tarname = gzipname
|
||
mode = "r:gz"
|
||
class GzipUstarReadTest(UstarReadTest):
|
||
tarname = gzipname
|
||
mode = "r:gz"
|
||
class GzipStreamReadTest(StreamReadTest):
|
||
tarname = gzipname
|
||
mode = "r|gz"
|
||
class GzipWriteTest(WriteTest):
|
||
mode = "w:gz"
|
||
class GzipStreamWriteTest(StreamWriteTest):
|
||
mode = "w|gz"
|
||
|
||
|
||
class Bz2MiscReadTest(MiscReadTest):
|
||
tarname = bz2name
|
||
mode = "r:bz2"
|
||
class Bz2UstarReadTest(UstarReadTest):
|
||
tarname = bz2name
|
||
mode = "r:bz2"
|
||
class Bz2StreamReadTest(StreamReadTest):
|
||
tarname = bz2name
|
||
mode = "r|bz2"
|
||
class Bz2WriteTest(WriteTest):
|
||
mode = "w:bz2"
|
||
class Bz2StreamWriteTest(StreamWriteTest):
|
||
mode = "w|bz2"
|
||
|
||
def test_main():
|
||
if not os.path.exists(TEMPDIR):
|
||
os.mkdir(TEMPDIR)
|
||
|
||
tests = [
|
||
UstarReadTest,
|
||
MiscReadTest,
|
||
StreamReadTest,
|
||
DetectReadTest,
|
||
MemberReadTest,
|
||
GNUReadTest,
|
||
PaxReadTest,
|
||
WriteTest,
|
||
StreamWriteTest,
|
||
GNUWriteTest,
|
||
PaxWriteTest,
|
||
UstarUnicodeTest,
|
||
GNUUnicodeTest,
|
||
PaxUnicodeTest,
|
||
AppendTest,
|
||
LimitsTest,
|
||
]
|
||
|
||
if hasattr(os, "link"):
|
||
tests.append(HardlinkTest)
|
||
|
||
fobj = open(tarname, "rb")
|
||
data = fobj.read()
|
||
fobj.close()
|
||
|
||
if gzip:
|
||
# Create testtar.tar.gz and add gzip-specific tests.
|
||
tar = gzip.open(gzipname, "wb")
|
||
tar.write(data)
|
||
tar.close()
|
||
|
||
tests += [
|
||
GzipMiscReadTest,
|
||
GzipUstarReadTest,
|
||
GzipStreamReadTest,
|
||
GzipWriteTest,
|
||
GzipStreamWriteTest,
|
||
]
|
||
|
||
if bz2:
|
||
# Create testtar.tar.bz2 and add bz2-specific tests.
|
||
tar = bz2.BZ2File(bz2name, "wb")
|
||
tar.write(data)
|
||
tar.close()
|
||
|
||
tests += [
|
||
Bz2MiscReadTest,
|
||
Bz2UstarReadTest,
|
||
Bz2StreamReadTest,
|
||
Bz2WriteTest,
|
||
Bz2StreamWriteTest,
|
||
]
|
||
|
||
try:
|
||
test_support.run_unittest(*tests)
|
||
finally:
|
||
if os.path.exists(TEMPDIR):
|
||
shutil.rmtree(TEMPDIR)
|
||
|
||
if __name__ == "__main__":
|
||
test_main()
|