commit b6a7737938e7e7b34f862f58aa5498e6f652e33d
author Bram Moolenaar <Bram@vim.org> Mon Feb 15 22:55:28 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Feb 15 22:55:28 2016 +0100
tree 9ac1b8582fb7b2f7d50f82a9ffe36d4378c0dfa8
parent 97eba78f69ba68ce8e1fc72bbe762fc321e0a4b1

patch 7.4.1327
Problem:    Channel test doesn't work if Python executable is python.exe.
Solution:   Find py.exe or python.exe. (Ken Takata)

src/testdir/test_channel.vim

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 339db45..e7448fa 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -13,9 +13,14 @@
   if !(executable('python') && (has('job') || executable('pkill')))
     finish
   endif
+  let s:python = 'python'
 elseif has('win32')
-  " Use Python Launcher for Windows (py.exe).
-  if !executable('py')
+  " Use Python Launcher for Windows (py.exe) if available.
+  if executable('py.exe')
+    let s:python = 'py.exe'
+  elseif executable('python.exe')
+    let s:python = 'python.exe'
+  else
     finish
   endif
 else
@@ -32,11 +37,11 @@
 
   try
     if has('job')
-      let s:job = job_start("python test_channel.py")
+      let s:job = job_start(s:python . " test_channel.py")
     elseif has('win32')
-      silent !start cmd /c start "test_channel" py test_channel.py
+      exe 'silent !start cmd /c start "test_channel" ' . s:python . ' test_channel.py'
     else
-      silent !python test_channel.py&
+      exe 'silent !' . s:python . ' test_channel.py&'
     endif
 
     " Wait for up to 2 seconds for the port number to be there.
@@ -77,7 +82,7 @@
       unlet s:job
     endif
   elseif has('win32')
-    call system('taskkill /IM py.exe /T /F /FI "WINDOWTITLE eq test_channel"')
+    call system('taskkill /IM ' . s:python . ' /T /F /FI "WINDOWTITLE eq test_channel"')
   else
     call system("pkill -f test_channel.py")
   endif
@@ -283,7 +288,7 @@
   if !has('job')
     return
   endif
-  let job = job_start("python test_channel_pipe.py")
+  let job = job_start(s:python . " test_channel_pipe.py")
   call assert_equal("run", job_status(job))
   try
     let handle = job_getchannel(job)

src/version.c

diff --git a/src/version.c b/src/version.c
index bd13c6d..74e0588 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1327,
+/**/
     1326,
 /**/
     1325,