Author: Matti Picus <matti.pi...@gmail.com>
Branch:
Changeset: r71030:5a387dadf128
Date: 2014-04-27 22:44 +0300
http://bitbucket.org/pypy/pypy/changeset/5a387dadf128/
Log: fix _zip_directory_cache
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
@@ -56,6 +56,8 @@
w = space.wrap
w_d = space.newdict()
for key, info in w_zipimporter.zip_file.NameToInfo.iteritems():
+ if ZIPSEP != os.path.sep:
+ key = key.replace(ZIPSEP, os.path.sep)
space.setitem(w_d, w(key), space.newtuple([
w(info.filename), w(info.compress_type), w(info.compress_size),
w(info.file_size), w(info.file_offset), w(info.dostime),
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
@@ -157,7 +157,6 @@
import sys, os
self.writefile("uuu.py", "def f(x): return x")
mod = __import__('uuu', globals(), locals(), [])
- print mod
assert mod.f(3) == 3
expected = {
'__doc__' : None,
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
