Merge 5811fad into 70dfc84

Author: Leandros

docs/installation.rst

@@ -8,15 +8,15 @@ Using pip
 
 You can install the package without being root by adding the ``--user`` flag::
 
-    pip2 install neovim
-    pip3 install neovim
+    pip2 install --user neovim
+    pip3 install --user neovim
 
 .. note::
 
     If you only use one of python2 or python3,
     it is enough to install that version.
 
-If you follow Neovim master,
+If you follow Neovim HEAD,
 make sure to upgrade the ``python-client`` when you upgrade Neovim::
 
     pip2 install --upgrade neovim

neovim/api/nvim.py

@@ -53,7 +53,7 @@ def from_session(cls, session):
         creating specialized objects from Nvim remote handles.
         """
         session.error_wrapper = lambda e: NvimError(e[1])
-        channel_id, metadata = session.request(b'vim_get_api_info')
+        channel_id, metadata = session.request(b'nvim_get_api_info')
 
         if IS_PYTHON3:
             # decode all metadata strings for python3

neovim/plugin/script_host.py

@@ -45,6 +45,12 @@ def __init__(self, nvim):
         self.legacy_vim = LegacyVim.from_nvim(nvim)
         sys.modules['vim'] = self.legacy_vim
 
+        # Handle DirChanged. #296
+        nvim.command(
+            'autocmd DirChanged * call rpcrequest({}, "python_chdir", v:event)'
+            .format(nvim.channel_id), async=True)
+        os.chdir(nvim.eval('getcwd()', async=False))
+
     def setup(self, nvim):
         """Setup import hooks and global streams.
 
@@ -153,6 +159,11 @@ def python_eval(self, expr):
         """Handle the `pyeval` vim function."""
         return eval(expr, self.module.__dict__)
 
+    @rpc_export('python_chdir', sync=True)
+    def python_chdir(self, args):
+        """Handle working directory changes."""
+        os.chdir(args['cwd'])
+
     def _set_current_range(self, start, stop):
         current = self.legacy_vim.current
         current.range = current.buffer.range(start, stop)
@@ -184,7 +195,7 @@ def num_to_str(obj):
 
 class LegacyVim(Nvim):
     def eval(self, expr):
-        obj = self.request("vim_eval", expr)
+        obj = self.request("nvim_eval", expr)
         return walk(num_to_str, obj)
 
 

test/test_vim.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import os, tempfile
+import os, sys, tempfile
 from nose.tools import with_setup, eq_ as eq, ok_ as ok
 from test_common import vim, cleanup
 
@@ -162,3 +162,24 @@ def test_hash():
     eq(d[vim.current.buffer], "alpha")
     vim.command('winc w')
     eq(d[vim.current.buffer], "beta")
+
+
+@with_setup(setup=cleanup)
+def test_cwd():
+    # Detect whether we're running under python2 or python3.
+    IS_PYTHON3 = sys.version_info >= (3, 0)
+    if IS_PYTHON3:
+        pycmd = 'python3'
+    else:
+        pycmd = 'python'
+
+    vim.command('%s import os' % pycmd)
+    vim.command('cd test')
+    cwd_vim = vim.command_output('pwd')
+    if IS_PYTHON3:
+        cwd_python = vim.command_output('%s print(os.getcwd())' % pycmd)
+    else:
+        cwd_python = vim.command_output('%s print os.getcwd()' % pycmd)
+
+    eq(cwd_vim, cwd_python)
+