mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00

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. ........
420 lines
14 KiB
Python
420 lines
14 KiB
Python
# We can test part of the module without zlib.
|
|
try:
|
|
import zlib
|
|
except ImportError:
|
|
zlib = None
|
|
|
|
import zipfile, os, unittest, sys, shutil
|
|
|
|
from StringIO import StringIO
|
|
from tempfile import TemporaryFile
|
|
|
|
from test.test_support import TESTFN, run_unittest
|
|
|
|
TESTFN2 = TESTFN + "2"
|
|
|
|
class TestsWithSourceFile(unittest.TestCase):
|
|
def setUp(self):
|
|
line_gen = ("Test of zipfile line %d." % i for i in range(0, 1000))
|
|
self.data = '\n'.join(line_gen)
|
|
|
|
# Make a source file with some lines
|
|
fp = open(TESTFN, "wb")
|
|
fp.write(self.data)
|
|
fp.close()
|
|
|
|
def zipTest(self, f, compression):
|
|
# Create the ZIP archive
|
|
zipfp = zipfile.ZipFile(f, "w", compression)
|
|
zipfp.write(TESTFN, "another"+os.extsep+"name")
|
|
zipfp.write(TESTFN, TESTFN)
|
|
zipfp.writestr("strfile", self.data)
|
|
zipfp.close()
|
|
|
|
# Read the ZIP archive
|
|
zipfp = zipfile.ZipFile(f, "r", compression)
|
|
self.assertEqual(zipfp.read(TESTFN), self.data)
|
|
self.assertEqual(zipfp.read("another"+os.extsep+"name"), self.data)
|
|
self.assertEqual(zipfp.read("strfile"), self.data)
|
|
|
|
# Print the ZIP directory
|
|
fp = StringIO()
|
|
stdout = sys.stdout
|
|
try:
|
|
sys.stdout = fp
|
|
|
|
zipfp.printdir()
|
|
finally:
|
|
sys.stdout = stdout
|
|
|
|
directory = fp.getvalue()
|
|
lines = directory.splitlines()
|
|
self.assertEquals(len(lines), 4) # Number of files + header
|
|
|
|
self.assert_('File Name' in lines[0])
|
|
self.assert_('Modified' in lines[0])
|
|
self.assert_('Size' in lines[0])
|
|
|
|
fn, date, time, size = lines[1].split()
|
|
self.assertEquals(fn, 'another.name')
|
|
# XXX: timestamp is not tested
|
|
self.assertEquals(size, str(len(self.data)))
|
|
|
|
# Check the namelist
|
|
names = zipfp.namelist()
|
|
self.assertEquals(len(names), 3)
|
|
self.assert_(TESTFN in names)
|
|
self.assert_("another"+os.extsep+"name" in names)
|
|
self.assert_("strfile" in names)
|
|
|
|
# Check infolist
|
|
infos = zipfp.infolist()
|
|
names = [ i.filename for i in infos ]
|
|
self.assertEquals(len(names), 3)
|
|
self.assert_(TESTFN in names)
|
|
self.assert_("another"+os.extsep+"name" in names)
|
|
self.assert_("strfile" in names)
|
|
for i in infos:
|
|
self.assertEquals(i.file_size, len(self.data))
|
|
|
|
# check getinfo
|
|
for nm in (TESTFN, "another"+os.extsep+"name", "strfile"):
|
|
info = zipfp.getinfo(nm)
|
|
self.assertEquals(info.filename, nm)
|
|
self.assertEquals(info.file_size, len(self.data))
|
|
|
|
# Check that testzip doesn't raise an exception
|
|
zipfp.testzip()
|
|
|
|
|
|
zipfp.close()
|
|
|
|
|
|
|
|
|
|
def testStored(self):
|
|
for f in (TESTFN2, TemporaryFile(), StringIO()):
|
|
self.zipTest(f, zipfile.ZIP_STORED)
|
|
|
|
if zlib:
|
|
def testDeflated(self):
|
|
for f in (TESTFN2, TemporaryFile(), StringIO()):
|
|
self.zipTest(f, zipfile.ZIP_DEFLATED)
|
|
|
|
def testAbsoluteArcnames(self):
|
|
zipfp = zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED)
|
|
zipfp.write(TESTFN, "/absolute")
|
|
zipfp.close()
|
|
|
|
zipfp = zipfile.ZipFile(TESTFN2, "r", zipfile.ZIP_STORED)
|
|
self.assertEqual(zipfp.namelist(), ["absolute"])
|
|
zipfp.close()
|
|
|
|
|
|
def tearDown(self):
|
|
os.remove(TESTFN)
|
|
os.remove(TESTFN2)
|
|
|
|
class TestZip64InSmallFiles(unittest.TestCase):
|
|
# These tests test the ZIP64 functionality without using large files,
|
|
# see test_zipfile64 for proper tests.
|
|
|
|
def setUp(self):
|
|
self._limit = zipfile.ZIP64_LIMIT
|
|
zipfile.ZIP64_LIMIT = 5
|
|
|
|
line_gen = ("Test of zipfile line %d." % i for i in range(0, 1000))
|
|
self.data = '\n'.join(line_gen)
|
|
|
|
# Make a source file with some lines
|
|
fp = open(TESTFN, "wb")
|
|
fp.write(self.data)
|
|
fp.close()
|
|
|
|
def largeFileExceptionTest(self, f, compression):
|
|
zipfp = zipfile.ZipFile(f, "w", compression)
|
|
self.assertRaises(zipfile.LargeZipFile,
|
|
zipfp.write, TESTFN, "another"+os.extsep+"name")
|
|
zipfp.close()
|
|
|
|
def largeFileExceptionTest2(self, f, compression):
|
|
zipfp = zipfile.ZipFile(f, "w", compression)
|
|
self.assertRaises(zipfile.LargeZipFile,
|
|
zipfp.writestr, "another"+os.extsep+"name", self.data)
|
|
zipfp.close()
|
|
|
|
def testLargeFileException(self):
|
|
for f in (TESTFN2, TemporaryFile(), StringIO()):
|
|
self.largeFileExceptionTest(f, zipfile.ZIP_STORED)
|
|
self.largeFileExceptionTest2(f, zipfile.ZIP_STORED)
|
|
|
|
def zipTest(self, f, compression):
|
|
# Create the ZIP archive
|
|
zipfp = zipfile.ZipFile(f, "w", compression, allowZip64=True)
|
|
zipfp.write(TESTFN, "another"+os.extsep+"name")
|
|
zipfp.write(TESTFN, TESTFN)
|
|
zipfp.writestr("strfile", self.data)
|
|
zipfp.close()
|
|
|
|
# Read the ZIP archive
|
|
zipfp = zipfile.ZipFile(f, "r", compression)
|
|
self.assertEqual(zipfp.read(TESTFN), self.data)
|
|
self.assertEqual(zipfp.read("another"+os.extsep+"name"), self.data)
|
|
self.assertEqual(zipfp.read("strfile"), self.data)
|
|
|
|
# Print the ZIP directory
|
|
fp = StringIO()
|
|
stdout = sys.stdout
|
|
try:
|
|
sys.stdout = fp
|
|
|
|
zipfp.printdir()
|
|
finally:
|
|
sys.stdout = stdout
|
|
|
|
directory = fp.getvalue()
|
|
lines = directory.splitlines()
|
|
self.assertEquals(len(lines), 4) # Number of files + header
|
|
|
|
self.assert_('File Name' in lines[0])
|
|
self.assert_('Modified' in lines[0])
|
|
self.assert_('Size' in lines[0])
|
|
|
|
fn, date, time, size = lines[1].split()
|
|
self.assertEquals(fn, 'another.name')
|
|
# XXX: timestamp is not tested
|
|
self.assertEquals(size, str(len(self.data)))
|
|
|
|
# Check the namelist
|
|
names = zipfp.namelist()
|
|
self.assertEquals(len(names), 3)
|
|
self.assert_(TESTFN in names)
|
|
self.assert_("another"+os.extsep+"name" in names)
|
|
self.assert_("strfile" in names)
|
|
|
|
# Check infolist
|
|
infos = zipfp.infolist()
|
|
names = [ i.filename for i in infos ]
|
|
self.assertEquals(len(names), 3)
|
|
self.assert_(TESTFN in names)
|
|
self.assert_("another"+os.extsep+"name" in names)
|
|
self.assert_("strfile" in names)
|
|
for i in infos:
|
|
self.assertEquals(i.file_size, len(self.data))
|
|
|
|
# check getinfo
|
|
for nm in (TESTFN, "another"+os.extsep+"name", "strfile"):
|
|
info = zipfp.getinfo(nm)
|
|
self.assertEquals(info.filename, nm)
|
|
self.assertEquals(info.file_size, len(self.data))
|
|
|
|
# Check that testzip doesn't raise an exception
|
|
zipfp.testzip()
|
|
|
|
|
|
zipfp.close()
|
|
|
|
def testStored(self):
|
|
for f in (TESTFN2, TemporaryFile(), StringIO()):
|
|
self.zipTest(f, zipfile.ZIP_STORED)
|
|
|
|
|
|
if zlib:
|
|
def testDeflated(self):
|
|
for f in (TESTFN2, TemporaryFile(), StringIO()):
|
|
self.zipTest(f, zipfile.ZIP_DEFLATED)
|
|
|
|
def testAbsoluteArcnames(self):
|
|
zipfp = zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED, allowZip64=True)
|
|
zipfp.write(TESTFN, "/absolute")
|
|
zipfp.close()
|
|
|
|
zipfp = zipfile.ZipFile(TESTFN2, "r", zipfile.ZIP_STORED)
|
|
self.assertEqual(zipfp.namelist(), ["absolute"])
|
|
zipfp.close()
|
|
|
|
|
|
def tearDown(self):
|
|
zipfile.ZIP64_LIMIT = self._limit
|
|
os.remove(TESTFN)
|
|
os.remove(TESTFN2)
|
|
|
|
class PyZipFileTests(unittest.TestCase):
|
|
def testWritePyfile(self):
|
|
zipfp = zipfile.PyZipFile(TemporaryFile(), "w")
|
|
fn = __file__
|
|
if fn.endswith('.pyc') or fn.endswith('.pyo'):
|
|
fn = fn[:-1]
|
|
|
|
zipfp.writepy(fn)
|
|
|
|
bn = os.path.basename(fn)
|
|
self.assert_(bn not in zipfp.namelist())
|
|
self.assert_(bn + 'o' in zipfp.namelist() or bn + 'c' in zipfp.namelist())
|
|
zipfp.close()
|
|
|
|
|
|
zipfp = zipfile.PyZipFile(TemporaryFile(), "w")
|
|
fn = __file__
|
|
if fn.endswith('.pyc') or fn.endswith('.pyo'):
|
|
fn = fn[:-1]
|
|
|
|
zipfp.writepy(fn, "testpackage")
|
|
|
|
bn = "%s/%s"%("testpackage", os.path.basename(fn))
|
|
self.assert_(bn not in zipfp.namelist())
|
|
self.assert_(bn + 'o' in zipfp.namelist() or bn + 'c' in zipfp.namelist())
|
|
zipfp.close()
|
|
|
|
def testWritePythonPackage(self):
|
|
import email
|
|
packagedir = os.path.dirname(email.__file__)
|
|
|
|
zipfp = zipfile.PyZipFile(TemporaryFile(), "w")
|
|
zipfp.writepy(packagedir)
|
|
|
|
# Check for a couple of modules at different levels of the hieararchy
|
|
names = zipfp.namelist()
|
|
self.assert_('email/__init__.pyo' in names or 'email/__init__.pyc' in names)
|
|
self.assert_('email/mime/text.pyo' in names or 'email/mime/text.pyc' in names)
|
|
|
|
def testWritePythonDirectory(self):
|
|
os.mkdir(TESTFN2)
|
|
try:
|
|
fp = open(os.path.join(TESTFN2, "mod1.py"), "w")
|
|
fp.write("print(42)\n")
|
|
fp.close()
|
|
|
|
fp = open(os.path.join(TESTFN2, "mod2.py"), "w")
|
|
fp.write("print(42 * 42)\n")
|
|
fp.close()
|
|
|
|
fp = open(os.path.join(TESTFN2, "mod2.txt"), "w")
|
|
fp.write("bla bla bla\n")
|
|
fp.close()
|
|
|
|
zipfp = zipfile.PyZipFile(TemporaryFile(), "w")
|
|
zipfp.writepy(TESTFN2)
|
|
|
|
names = zipfp.namelist()
|
|
self.assert_('mod1.pyc' in names or 'mod1.pyo' in names)
|
|
self.assert_('mod2.pyc' in names or 'mod2.pyo' in names)
|
|
self.assert_('mod2.txt' not in names)
|
|
|
|
finally:
|
|
shutil.rmtree(TESTFN2)
|
|
|
|
|
|
|
|
class OtherTests(unittest.TestCase):
|
|
def testCreateNonExistentFileForAppend(self):
|
|
if os.path.exists(TESTFN):
|
|
os.unlink(TESTFN)
|
|
|
|
filename = 'testfile.txt'
|
|
content = 'hello, world. this is some content.'
|
|
|
|
try:
|
|
zf = zipfile.ZipFile(TESTFN, 'a')
|
|
zf.writestr(filename, content)
|
|
zf.close()
|
|
except IOError:
|
|
self.fail('Could not append data to a non-existent zip file.')
|
|
|
|
self.assert_(os.path.exists(TESTFN))
|
|
|
|
zf = zipfile.ZipFile(TESTFN, 'r')
|
|
self.assertEqual(zf.read(filename), content)
|
|
zf.close()
|
|
|
|
os.unlink(TESTFN)
|
|
|
|
def testCloseErroneousFile(self):
|
|
# This test checks that the ZipFile constructor closes the file object
|
|
# it opens if there's an error in the file. If it doesn't, the traceback
|
|
# holds a reference to the ZipFile object and, indirectly, the file object.
|
|
# On Windows, this causes the os.unlink() call to fail because the
|
|
# underlying file is still open. This is SF bug #412214.
|
|
#
|
|
fp = open(TESTFN, "w")
|
|
fp.write("this is not a legal zip file\n")
|
|
fp.close()
|
|
try:
|
|
zf = zipfile.ZipFile(TESTFN)
|
|
except zipfile.BadZipfile:
|
|
os.unlink(TESTFN)
|
|
|
|
def testNonExistentFileRaisesIOError(self):
|
|
# make sure we don't raise an AttributeError when a partially-constructed
|
|
# ZipFile instance is finalized; this tests for regression on SF tracker
|
|
# bug #403871.
|
|
|
|
# The bug we're testing for caused an AttributeError to be raised
|
|
# when a ZipFile instance was created for a file that did not
|
|
# exist; the .fp member was not initialized but was needed by the
|
|
# __del__() method. Since the AttributeError is in the __del__(),
|
|
# it is ignored, but the user should be sufficiently annoyed by
|
|
# the message on the output that regression will be noticed
|
|
# quickly.
|
|
self.assertRaises(IOError, zipfile.ZipFile, TESTFN)
|
|
|
|
def testClosedZipRaisesRuntimeError(self):
|
|
# Verify that testzip() doesn't swallow inappropriate exceptions.
|
|
data = StringIO()
|
|
zipf = zipfile.ZipFile(data, mode="w")
|
|
zipf.writestr("foo.txt", "O, for a Muse of Fire!")
|
|
zipf.close()
|
|
|
|
# This is correct; calling .read on a closed ZipFile should throw
|
|
# a RuntimeError, and so should calling .testzip. An earlier
|
|
# version of .testzip would swallow this exception (and any other)
|
|
# and report that the first file in the archive was corrupt.
|
|
self.assertRaises(RuntimeError, zipf.testzip)
|
|
|
|
|
|
class DecryptionTests(unittest.TestCase):
|
|
# This test checks that ZIP decryption works. Since the library does not
|
|
# support encryption at the moment, we use a pre-generated encrypted
|
|
# ZIP file
|
|
|
|
data = (
|
|
'PK\x03\x04\x14\x00\x01\x00\x00\x00n\x92i.#y\xef?&\x00\x00\x00\x1a\x00'
|
|
'\x00\x00\x08\x00\x00\x00test.txt\xfa\x10\xa0gly|\xfa-\xc5\xc0=\xf9y'
|
|
'\x18\xe0\xa8r\xb3Z}Lg\xbc\xae\xf9|\x9b\x19\xe4\x8b\xba\xbb)\x8c\xb0\xdbl'
|
|
'PK\x01\x02\x14\x00\x14\x00\x01\x00\x00\x00n\x92i.#y\xef?&\x00\x00\x00'
|
|
'\x1a\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x01\x00 \x00\xb6\x81'
|
|
'\x00\x00\x00\x00test.txtPK\x05\x06\x00\x00\x00\x00\x01\x00\x01\x006\x00'
|
|
'\x00\x00L\x00\x00\x00\x00\x00' )
|
|
|
|
plain = 'zipfile.py encryption test'
|
|
|
|
def setUp(self):
|
|
fp = open(TESTFN, "wb")
|
|
fp.write(self.data)
|
|
fp.close()
|
|
self.zip = zipfile.ZipFile(TESTFN, "r")
|
|
|
|
def tearDown(self):
|
|
self.zip.close()
|
|
os.unlink(TESTFN)
|
|
|
|
def testNoPassword(self):
|
|
# Reading the encrypted file without password
|
|
# must generate a RunTime exception
|
|
self.assertRaises(RuntimeError, self.zip.read, "test.txt")
|
|
|
|
def testBadPassword(self):
|
|
self.zip.setpassword("perl")
|
|
self.assertRaises(RuntimeError, self.zip.read, "test.txt")
|
|
|
|
def testGoodPassword(self):
|
|
self.zip.setpassword("python")
|
|
self.assertEquals(self.zip.read("test.txt"), self.plain)
|
|
|
|
def test_main():
|
|
run_unittest(TestsWithSourceFile, TestZip64InSmallFiles, OtherTests,
|
|
PyZipFileTests, DecryptionTests)
|
|
#run_unittest(TestZip64InSmallFiles)
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|