Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r84749:350cc724b099
Date: 2016-05-27 15:18 -0700
http://bitbucket.org/pypy/pypy/changeset/350cc724b099/
Log: more fsdecoding fixes
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
@@ -338,7 +338,8 @@
# We have the module, but no source.
return space.w_None
raise oefmt(get_error(space),
- "Cannot find source for %s in %R", filename,
+ "Cannot find source for %R in %R",
+ space.wrap_fsdecoded(filename),
space.wrap_fsdecoded(self.name))
def get_filename(self, space, w_fullname):
@@ -360,7 +361,7 @@
return space.wrap(is_package)
raise oefmt(get_error(space),
"Cannot find module %R in %R",
- w_filename, space.wrap_fsdecoded(self.name))
+ w_fullname, space.wrap_fsdecoded(self.name))
def getarchive(self, space):
space = self.space
@@ -413,8 +414,8 @@
w_result = zip_cache.get(filename)
if w_result is None:
raise oefmt(get_error(space),
- "Cannot import %s from zipfile, recursion detected or"
- "already tried and failed", name)
+ "Cannot import %R from zipfile, recursion detected or"
+ "already tried and failed", w_name)
except KeyError:
zip_cache.cache[filename] = None
try:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
