Merge pull request #141 from bfredl/str_enc

Don't override the encoding of msgpack STR

Author: bfredl

neovim/api/nvim.py

@@ -46,9 +46,6 @@ def from_session(cls, session):
         session.error_wrapper = lambda e: NvimError(e[1])
         channel_id, metadata = session.request(b'vim_get_api_info')
 
-        encoding = session.request(b'vim_get_option', b'encoding')
-        session._async_session._msgpack_stream.set_packer_encoding(encoding)
-
         if IS_PYTHON3:
             hook = DecodeHook()
             # decode all metadata strings for python3

neovim/msgpack_rpc/msgpack_stream.py

@@ -19,14 +19,10 @@ class MsgpackStream(object):
     def __init__(self, event_loop):
         """Wrap `event_loop` on a msgpack-aware interface."""
         self._event_loop = event_loop
-        self._packer = Packer(use_bin_type=True, encoding=None)
+        self._packer = Packer(use_bin_type=True)
         self._unpacker = Unpacker()
         self._message_cb = None
 
-    def set_packer_encoding(self, encoding):
-        """Switch encoding for Unicode strings."""
-        self._packer = Packer(use_bin_type=True, encoding=encoding)
-
     def threadsafe_call(self, fn):
         """Wrapper around `BaseEventLoop.threadsafe_call`."""
         self._event_loop.threadsafe_call(fn)