[pypy-commit] pypy py3.5: Fix for test_package. This might fix the next issue for "pypy3 -m ensurepip".

arigo pypy.commits at gmail.com
Wed Dec 20 11:03:40 EST 2017


Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r93519:5a865516f947
Date: 2017-12-20 17:01 +0100
http://bitbucket.org/pypy/pypy/changeset/5a865516f947/

Log:	Fix for test_package. This might fix the next issue for "pypy3 -m
	ensurepip".

diff --git a/pypy/module/zipimport/interp_zipimport.py b/pypy/module/zipimport/interp_zipimport.py
--- a/pypy/module/zipimport/interp_zipimport.py
+++ b/pypy/module/zipimport/interp_zipimport.py
@@ -252,6 +252,8 @@
         gets in code_object.co_filename. Something like
         'myfile.zip/mymodule.py'
         """
+        if ZIPSEP != os.path.sep:
+            filename = filename.replace(ZIPSEP, os.path.sep)
         return self.filename + os.path.sep + filename
 
     def load_module(self, space, w_fullname):


More information about the pypy-commit mailing list