Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r84751:2b559f433aeb
Date: 2016-05-27 15:38 -0700
http://bitbucket.org/pypy/pypy/changeset/2b559f433aeb/
Log: a few more fsdecodes
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
@@ -129,8 +129,8 @@
def getprefix(self, space):
if ZIPSEP == os.path.sep:
- return space.wrap(self.prefix)
- return space.wrap(self.prefix.replace(ZIPSEP, os.path.sep))
+ return space.wrap_fsdecoded(self.prefix)
+ return space.wrap_fsdecoded(self.prefix.replace(ZIPSEP, os.path.sep))
def _find_relative_path(self, filename):
if filename.startswith(self.filename):
@@ -388,7 +388,8 @@
elif not ns_portion:
result = [self, space.newlist([])]
else:
- result = [space.w_None, space.newlist([space.wrap(ns_portion)])]
+ result = [space.w_None,
+ space.newlist([space.wrap_fsdecoded(ns_portion)])]
return space.newtuple(result)
def descr_new_zipimporter(space, w_type, w_name):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
