From d1ae066cf9aab6e66f64222ae479e7bb18f125db Mon Sep 17 00:00:00 2001
From: erw7 <erw7.github@gmail.com>
Date: Tue, 2 Jan 2018 13:19:35 +0900
Subject: [PATCH] Fix insufficient correspondence to python3

---
 autoload/nim.vim    | 10 ++++++----
 autoload/nim_vim.py |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/autoload/nim.vim b/autoload/nim.vim
index 0bfb1f7..90551fc 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -11,8 +11,10 @@ endif
 
 if has("python3")
   exe 'py3file ' . fnameescape(s:plugin_path) . '/nim_vim.py'
+  let s:py_cmd = 'py3 '
 elseif has("python")
   exe 'pyfile ' . fnameescape(s:plugin_path) . '/nim_vim.py'
+  let s:py_cmd = 'py '
 endif
 
 fun! nim#init()
@@ -53,16 +55,16 @@ augroup NimVim
   au!
   au BufEnter log://nim call s:UpdateNimLog()
   " au QuitPre * :py nimTerminateAll()
-  au VimLeavePre * :py nimTerminateAll()
+  exe printf("au VimLeavePre * :%s nimTerminateAll()", s:py_cmd)
 augroup END
 
 command! NimLog :e log://nim
 
 command! NimTerminateService
-  \ :exe printf("py nimTerminateService('%s')", b:nim_project_root)
+  \ :exe printf("%s nimTerminateService('%s')", s:py_cmd, b:nim_project_root)
 
 command! NimRestartService
-  \ :exe printf("py nimRestartService('%s')", b:nim_project_root)
+  \ :exe printf("%s nimRestartService('%s')", s:py_cmd, b:nim_project_root)
 
 fun! s:CurrentNimFile()
   let save_cur = getpos('.')
@@ -116,7 +118,7 @@ fun! NimExec(op)
   endif
 
   if b:nim_caas_enabled
-    exe printf("py nimExecCmd('%s', '%s', False)", b:nim_project_root, cmd)
+    exe printf("%s nimExecCmd('%s', '%s', False)", s:py_cmd, b:nim_project_root, cmd)
     let output = l:py_res
   else
     let output = system("nim " . cmd)
diff --git a/autoload/nim_vim.py b/autoload/nim_vim.py
index dde6e9f..71b7330 100644
--- a/autoload/nim_vim.py
+++ b/autoload/nim_vim.py
@@ -73,7 +73,7 @@ def nimStartService(project):
   return target
 
 def nimTerminateService(project):
-  if NimProjects.has_key(project):
+  if project in NimProjects:
     NimProjects[project].postNimCmd("quit")
     del NimProjects[project]
 
@@ -83,7 +83,7 @@ def nimRestartService(project):
 
 def nimExecCmd(project, cmd, async = True):
   target = None
-  if NimProjects.has_key(project):
+  if project in NimProjects:
     target = NimProjects[project]
   else:
     target = nimStartService(project)