Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r90068:ec83c91917b2
Date: 2017-02-12 10:39 +0100
http://bitbucket.org/pypy/pypy/changeset/ec83c91917b2/
Log: unicode fixes
diff --git a/pypy/module/_warnings/interp_warnings.py
b/pypy/module/_warnings/interp_warnings.py
--- a/pypy/module/_warnings/interp_warnings.py
+++ b/pypy/module/_warnings/interp_warnings.py
@@ -140,7 +140,7 @@
# setup filename
try:
w_filename = space.getitem(w_globals, space.wrap("__file__"))
- filename = space.str_w(w_filename)
+ filename = space.fsencode_w(w_filename)
except OperationError as e:
if space.str_w(w_module) == '__main__':
w_argv = space.sys.getdictvalue(space, 'argv')
@@ -157,7 +157,7 @@
lc_filename = filename.lower()
if lc_filename.endswith(".pyc"):
# strip last character
- w_filename = space.wrap(filename[:-1])
+ w_filename = space.fsdecode(space.newbytes(filename[:-1]))
return (w_filename, lineno, w_module, w_registry)
@@ -242,9 +242,10 @@
w_stderr = space.sys.get("stderr")
# Print "filename:lineno: category: text\n"
- message = "%s:%d: %s: %s\n" % (space.str_w(w_filename), lineno,
- space.str_w(w_name), space.str_w(w_text))
- space.call_method(w_stderr, "write", space.wrap(message))
+ message = u"%s:%d: %s: %s\n" % (space.unicode_w(w_filename), lineno,
+ space.unicode_w(w_name),
+ space.unicode_w(w_text))
+ space.call_method(w_stderr, "write", space.newunicode(message))
# Print " source_line\n"
if not w_sourceline:
@@ -261,17 +262,17 @@
if not w_sourceline:
return
- line = space.str_w(w_sourceline)
+ line = space.unicode_w(w_sourceline)
if not line:
return
- message = "\n"
+ message = u"\n"
for i in range(len(line)):
c = line[i]
- if c not in ' \t\014':
- message = " %s\n" % (line[i:],)
+ if c not in u' \t\014':
+ message = u" %s\n" % (line[i:],)
break
- space.call_method(w_stderr, "write", space.wrap(message))
+ space.call_method(w_stderr, "write", space.newunicode(message))
def do_warn(space, w_message, w_category, stacklevel):
context_w = setup_context(space, stacklevel)
diff --git a/pypy/module/_warnings/test/test_warnings.py
b/pypy/module/_warnings/test/test_warnings.py
--- a/pypy/module/_warnings/test/test_warnings.py
+++ b/pypy/module/_warnings/test/test_warnings.py
@@ -87,3 +87,12 @@
class Foo:
pass
raises(TypeError, _warnings.warn, "text", Foo)
+
+ def test_surrogate_in_filename(self):
+ import _warnings, __pypy__
+ for filename in ("nonascii\xe9\u20ac", "surrogate\udc80"):
+ try:
+ __pypy__.fsencode(filename)
+ except UnicodeEncodeError:
+ continue
+ _warnings.warn_explicit("text", UserWarning, filename, 1)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
