[pypy-commit] pypy kill-faking: fixed zipimport tests

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: kill-faking
Changeset: r59254:75afd802017d
Date: 2012-12-02 14:51 -0800
http://bitbucket.org/pypy/pypy/changeset/75afd802017d/

Log:	fixed zipimport tests

diff --git a/pypy/module/zipimport/test/test_zipimport.py b/pypy/module/zipimport/test/test_zipimport.py
--- a/pypy/module/zipimport/test/test_zipimport.py
+++ b/pypy/module/zipimport/test/test_zipimport.py
@@ -7,17 +7,19 @@
 from StringIO import StringIO
 
 from pypy.tool.udir import udir
-from zipfile import ZIP_STORED, ZIP_DEFLATED, ZipInfo
+from zipfile import ZIP_STORED, ZIP_DEFLATED
+
 
 class AppTestZipimport:
     """ A bit structurized tests stolen and adapted from
     cpy's regression tests
     """
     compression = ZIP_STORED
-    spaceconfig = dict(usemodules=['zipimport', 'rctime', 'struct',
-                                   'itertools'])
+    spaceconfig = {
+        "usemodules": ['zipimport', 'rctime', 'struct', 'itertools', 'binascii'],
+    }
     pathsep = os.path.sep
-    
+
     @classmethod
     def make_pyc(cls, space, co, mtime):
         data = marshal.dumps(co)
@@ -48,7 +50,7 @@
         def get_file():
             return __file__
         """).compile()
-            
+
         space = cls.space
 
         tmpdir = udir.ensure('zipimport_%s' % cls.__name__, dir=1)
@@ -61,7 +63,6 @@
         #ziptestmodule = tmpdir.ensure('ziptestmodule.zip').write(
         ziptestmodule = tmpdir.join("somezip.zip")
         cls.w_tmpzip = space.wrap(str(ziptestmodule))
-        cls.w_co = space.wrap(co)
         cls.tmpdir = tmpdir
 
     def setup_class(cls):
@@ -162,7 +163,7 @@
         for key, val in expected.items():
             assert mod.__dict__[key] == val
         assert mod.__file__.endswith('.zip'+os.sep+'uuu.py')
-    
+
     def test_pyc(self):
         import sys, os
         self.writefile("uuu.pyc", self.test_pyc)
@@ -312,7 +313,7 @@
 
     def test_subdirectory_twice(self):
         #import os, zipimport
- 
+
         self.writefile("package/__init__.py", "")
         self.writefile("package/subpackage/__init__.py", "")
         self.writefile("package/subpackage/foo.py", "")
@@ -355,8 +356,9 @@
 
 class AppTestZipimportDeflated(AppTestZipimport):
     compression = ZIP_DEFLATED
-    spaceconfig = dict(usemodules=['zipimport', 'zlib', 'rctime', 'struct',
-                                   'itertools'])
+    spaceconfig = {
+        "usemodules": ['zipimport', 'zlib', 'rctime', 'struct', 'itertools', 'binascii'],
+    }
 
     def setup_class(cls):
         try: