[pypy-commit] pypy unicode-utf8-py3: fix for mac OS

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: unicode-utf8-py3
Changeset: r95688:a2e41be99943
Date: 2019-01-21 17:15 +0200
http://bitbucket.org/pypy/pypy/changeset/a2e41be99943/

Log:	fix for mac OS

diff --git a/pypy/interpreter/unicodehelper.py b/pypy/interpreter/unicodehelper.py
--- a/pypy/interpreter/unicodehelper.py
+++ b/pypy/interpreter/unicodehelper.py
@@ -82,9 +82,8 @@
                            errorhandler=errorhandler, force_ignore=False)
     elif _MACOSX:
         bytes = space.bytes_w(w_string)
-        utf8 = str_decode_utf8(
-            bytes, 'surrogateescape', final=True,
-            allow_surrogates=False)[0]
+        utf8 = str_decode_utf8(bytes, 'surrogateescape', True, errorhandler,
+                               allow_surrogates=False)[0]
         uni = space.realunicode_w(utf8)
     elif space.sys.filesystemencoding is None or state.codec_need_encodings:
         # bootstrap check: if the filesystemencoding isn't initialized