Merge pull request #439 from Shougo/unicode_errors

Author: jamessan

pynvim/compat.py

@@ -34,7 +34,7 @@ def find_module(fullname, path):
     unicode_errors_default = 'surrogateescape'
 else:
     find_module = original_find_module
-    unicode_errors_default = 'strict'
+    unicode_errors_default = 'ignore'
 
 NUM_TYPES = (int, long, float)
 

pynvim/msgpack_rpc/msgpack_stream.py

@@ -21,7 +21,7 @@ def __init__(self, event_loop):
         """Wrap `event_loop` on a msgpack-aware interface."""
         self.loop = event_loop
         self._packer = Packer(unicode_errors=unicode_errors_default)
-        self._unpacker = Unpacker()
+        self._unpacker = Unpacker(unicode_errors=unicode_errors_default)
         self._message_cb = None
 
     def threadsafe_call(self, fn):

test/test_buffer.py

@@ -164,10 +164,10 @@ def test_mark(vim):
 def test_invalid_utf8(vim):
     vim.command('normal "=printf("%c", 0xFF)\np')
     assert vim.eval("char2nr(getline(1))") == 0xFF
-
     assert vim.current.buffer[:] == ['\udcff'] if IS_PYTHON3 else ['\xff']
+
     vim.current.line += 'x'
-    assert vim.eval("getline(1)", decode=False) == b'\xFFx'
+    assert vim.eval("getline(1)", decode=False) == '\udcffx' if IS_PYTHON3 else '\xffx'
     assert vim.current.buffer[:] == ['\udcffx'] if IS_PYTHON3 else ['\xffx']