Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r62811:e8d05ade4b51
Date: 2013-03-26 10:24 -0700
http://bitbucket.org/pypy/pypy/changeset/e8d05ade4b51/
Log: merge
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
@@ -360,20 +360,6 @@
assert co_filename == expected
-class AppTestZipimportDeflated(AppTestZipimport):
- compression = ZIP_DEFLATED
- spaceconfig = {
- "usemodules": ['zipimport', 'zlib', 'rctime', 'struct', 'itertools',
'binascii'],
- }
-
- def setup_class(cls):
- try:
- import rpython.rlib.rzlib
- except ImportError:
- py.test.skip("zlib not available, cannot test compressed zipfiles")
- cls.make_class()
-
-
if os.sep != '/':
class AppTestNativePathSep(AppTestZipimport):
pathsep = os.sep
diff --git a/pypy/module/zipimport/test/test_zipimport_deflated.py
b/pypy/module/zipimport/test/test_zipimport_deflated.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/zipimport/test/test_zipimport_deflated.py
@@ -0,0 +1,18 @@
+import py
+
+from zipfile import ZIP_DEFLATED
+
+from pypy.module.zipimport.test.test_zipimport import AppTestZipimport
+
+class AppTestZipimportDeflated(AppTestZipimport):
+ compression = ZIP_DEFLATED
+ spaceconfig = {
+ "usemodules": ['zipimport', 'zlib', 'rctime', 'struct', 'itertools',
'binascii'],
+ }
+
+ def setup_class(cls):
+ try:
+ import rpython.rlib.rzlib
+ except ImportError:
+ py.test.skip("zlib not available, cannot test compressed zipfiles")
+ cls.make_class()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
