[Python-3000-checkins] r67194 - python/branches/py3k/Lib/test/test_zipfile64.py

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Wed Nov 12 02:57:36 2008
New Revision: 67194

Log:
#2971: test_zipfile64 fails.
This test is always skipped, but it is not a reason not to adapt it to py3k.

I had to reduce most of the big figures to actually run the test.


Modified:
python/branches/py3k/Lib/test/test_zipfile64.py

Modified: python/branches/py3k/Lib/test/test_zipfile64.py
==============================================================================
--- python/branches/py3k/Lib/test/test_zipfile64.py (original)
+++ python/branches/py3k/Lib/test/test_zipfile64.py Wed Nov 12 02:57:36 2008
@@ -35,7 +35,7 @@
def setUp(self):
# Create test data.
line_gen = ("Test of zipfile line %d." % i for i in range(1000000))
- self.data = '\n'.join(line_gen)
+ self.data = '\n'.join(line_gen).encode('ascii')

# And write it to a file.
fp = open(TESTFN, "wb")
@@ -100,21 +100,22 @@
# and that the resulting archive can be read properly by ZipFile
zipf = zipfile.ZipFile(TESTFN, mode="w")
zipf.debug = 100
- numfiles = (1 << 16) * 3/2
- for i in xrange(numfiles):
+ numfiles = (1 << 16) * 3//2
+ for i in range(numfiles):
zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
self.assertEqual(len(zipf.namelist()), numfiles)
zipf.close()

zipf2 = zipfile.ZipFile(TESTFN, mode="r")
self.assertEqual(len(zipf2.namelist()), numfiles)
- for i in xrange(numfiles):
- self.assertEqual(zipf2.read("foo%08d" % i), "%d" % (i**3 % 57))
+ for i in range(numfiles):
+ content = zipf2.read("foo%08d" % i).decode('ascii')
+ self.assertEqual(content, "%d" % (i**3 % 57))
zipf.close()

def tearDown(self):
- test_support.unlink(TESTFN)
- test_support.unlink(TESTFN2)
+ support.unlink(TESTFN)
+ support.unlink(TESTFN2)

def test_main():
run_unittest(TestsWithSourceFile, OtherTests)