[Python-3000-checkins] r62727 - in python/branches/py3k: Lib/test/test_zipfile.py

martin.v.loewis python-3000-checkins at python.org
Mon May 5 19:50:05 CEST 2008


Author: martin.v.loewis
Date: Mon May  5 19:50:05 2008
New Revision: 62727

Log:
Merged revisions 62726 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62726 | martin.v.loewis | 2008-05-05 19:47:06 +0200 (Mo, 05 Mai 2008) | 2 lines
  
  Fix Unicode filename test.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_zipfile.py

Modified: python/branches/py3k/Lib/test/test_zipfile.py
==============================================================================
--- python/branches/py3k/Lib/test/test_zipfile.py	(original)
+++ python/branches/py3k/Lib/test/test_zipfile.py	Mon May  5 19:50:05 2008
@@ -544,10 +544,12 @@
     def testUnicodeFilenames(self):
         zf = zipfile.ZipFile(TESTFN, "w")
         zf.writestr("foo.txt", "Test for unicode filename")
-        zf.writestr("fo\xf6.txt", "Test for unicode filename")
+        zf.writestr("\xf6.txt", "Test for unicode filename")
+        zf.close()
+        zf = zipfile.ZipFile(TESTFN, "r")
+        self.assertEqual(zf.filelist[0].filename, "foo.txt")
+        self.assertEqual(zf.filelist[1].filename, "\xf6.txt")
         zf.close()
-        zf = zipfile.ZipFile(TESTFN, "w")
-
 
     def testCreateNonExistentFileForAppend(self):
         if os.path.exists(TESTFN):


More information about the Python-3000-checkins mailing list