[pypy-svn] r59556 - pypy/trunk/pypy/module/zipimport/test

[fijal at codespeak.net]

Author: fijal
Date: Thu Oct 30 13:34:43 2008
New Revision: 59556

Modified:
   pypy/trunk/pypy/module/zipimport/test/test_zipimport.py
Log:
I hope this is final checkin here for today :]


Modified: pypy/trunk/pypy/module/zipimport/test/test_zipimport.py
==============================================================================
--- pypy/trunk/pypy/module/zipimport/test/test_zipimport.py	(original)
+++ pypy/trunk/pypy/module/zipimport/test/test_zipimport.py	Thu Oct 30 13:34:43 2008
@@ -59,7 +59,7 @@
             import time
             from zipfile import ZipFile, ZipInfo
             z = ZipFile(self.zipfile, 'w')
-            write_files = getattr(self, 'write_files', [])
+            write_files = self.write_files
             write_files.append((filename, data))
             for filename, data in write_files:
                 zinfo = ZipInfo(filename, time.localtime(self.now))
@@ -78,9 +78,7 @@
         space = self.space
         name = "test_%s_%s.zip" % (self.__class__.__name__, meth.__name__)
         self.w_zipfile = space.wrap(str(self.tmpdir.join(name)))
-        space.appexec([space.wrap(self)], """(self):
-        self.write_files = []
-        """)
+        self.w_write_files = space.newlist([])
         w_cache = space.getattr(space.getbuiltinmodule('zipimport'),
                                 space.wrap('_zip_directory_cache'))
         space.call_function(space.getattr(w_cache, space.wrap('clear')))
@@ -243,8 +241,8 @@
         """
         import os
         import zipimport
-        self.writefile(
-            self, os.sep.join(("directory", "package", "__init__.py")), "")
+        self.writefile(self,
+                     os.sep.join(("directory", "package", "__init__.py")), "")
         importer = zipimport.zipimporter(self.zipfile + "/directory")
         l = [i for i in zipimport._zip_directory_cache]
         assert len(l)