[pypy-commit] pypy py3.5: merge heads

[arigo]

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

Log:	merge heads

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):