Author: Richard Plangger <[email protected]>
Branch: py3.5
Changeset: r89442:01b498518160
Date: 2017-01-09 15:52 +0100
http://bitbucket.org/pypy/pypy/changeset/01b498518160/
Log: use BaseFSEncodeTest instead (support file was moved), this seems
like a merge conflict introduced long ago
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
@@ -4,10 +4,11 @@
import time
from zipfile import ZIP_STORED
+from pypy.interpreter.test.test_fsencode import BaseFSEncodeTest
from rpython.tool.udir import udir
-class AppTestZipimport:
+class AppTestZipimport(BaseFSEncodeTest):
""" A bit structurized tests stolen and adapted from
cpy's regression tests
"""
@@ -19,6 +20,7 @@
@classmethod
def make_class(cls):
+ BaseFSEncodeTest.setup_class.im_func(cls)
space = cls.space
w = space.wrap
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
