[pypy-commit] pypy py3k: enable the py3 mbcs defaults w/ fsencode/decode too

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r63605:f384e71d947f
Date: 2013-04-24 22:52 -0700
http://bitbucket.org/pypy/pypy/changeset/f384e71d947f/

Log:	enable the py3 mbcs defaults w/ fsencode/decode too

diff --git a/pypy/interpreter/unicodehelper.py b/pypy/interpreter/unicodehelper.py
--- a/pypy/interpreter/unicodehelper.py
+++ b/pypy/interpreter/unicodehelper.py
@@ -42,7 +42,8 @@
     if _WIN32:
         bytes = space.bytes_w(w_string)
         uni = str_decode_mbcs(bytes, len(bytes), 'strict',
-                              errorhandler=decode_error_handler(space))[0]
+                              errorhandler=decode_error_handler(space),
+                              force_ignore=False)[0]
     elif _MACOSX:
         bytes = space.bytes_w(w_string)
         uni = runicode.str_decode_utf_8(
@@ -69,7 +70,8 @@
     if _WIN32:
         uni = space.unicode_w(w_uni)
         bytes = unicode_encode_mbcs(uni, len(uni), 'strict',
-                                    errorhandler=encode_error_handler(space))
+                                    errorhandler=encode_error_handler(space),
+                                    force_replace=False)
     elif _MACOSX:
         uni = space.unicode_w(w_uni)
         bytes = runicode.unicode_encode_utf_8(