#729 - Support running Python programs from virtualenv for Windows

4 files changed, 7 insertions, 5 deletions

diff --git a/autoload/ale/fixers/autopep8.vim b/autoload/ale/fixers/autopep8.vim
index 908980dc..e2dd7bfe 100644
--- a/autoload/ale/fixers/autopep8.vim
+++ b/autoload/ale/fixers/autopep8.vim
@@ -9,7 +9,7 @@ function! ale#fixers#autopep8#Fix(buffer) abort
     let l:executable = ale#python#FindExecutable(
     \   a:buffer,
     \   'python_autopep8',
-    \   ['/bin/autopep8'],
+    \   ['autopep8'],
     \)
 
     if !executable(l:executable)
diff --git a/autoload/ale/fixers/isort.vim b/autoload/ale/fixers/isort.vim
index 067d44dd..00d968f4 100644
--- a/autoload/ale/fixers/isort.vim
+++ b/autoload/ale/fixers/isort.vim
@@ -8,7 +8,7 @@ function! ale#fixers#isort#Fix(buffer) abort
     let l:executable = ale#python#FindExecutable(
     \   a:buffer,
     \   'python_isort',
-    \   ['/bin/isort'],
+    \   ['isort'],
     \)
 
     if !executable(l:executable)
diff --git a/autoload/ale/fixers/yapf.vim b/autoload/ale/fixers/yapf.vim
index 117a9550..7d6dfdcb 100644
--- a/autoload/ale/fixers/yapf.vim
+++ b/autoload/ale/fixers/yapf.vim
@@ -8,7 +8,7 @@ function! ale#fixers#yapf#Fix(buffer) abort
     let l:executable = ale#python#FindExecutable(
     \   a:buffer,
     \   'python_yapf',
-    \   ['/bin/yapf'],
+    \   ['yapf'],
     \)
 
     if !executable(l:executable)
diff --git a/autoload/ale/python.vim b/autoload/ale/python.vim
index 4c516abf..95fa58c7 100644
--- a/autoload/ale/python.vim
+++ b/autoload/ale/python.vim
@@ -1,6 +1,8 @@
 " Author: w0rp <devw0rp@gmail.com>
 " Description: Functions for integrating with Python linters.
 
+" bin is used for Unix virtualenv directories, and Scripts is for Windows.
+let s:bin_dir = has('unix') ? 'bin' : 'Scripts'
 let g:ale_virtualenv_dir_names = get(g:, 'ale_virtualenv_dir_names', [
 \   '.env',
 \   'env',
@@ -29,7 +31,7 @@ function! ale#python#FindVirtualenv(buffer) abort
         for l:dirname in ale#Var(a:buffer, 'virtualenv_dir_names')
             let l:venv_dir = simplify(l:path . '/' . l:dirname)
 
-            if filereadable(l:venv_dir . '/bin/activate')
+            if filereadable(simplify(l:venv_dir . '/' . s:bin_dir . '/activate'))
                 return l:venv_dir
             endif
         endfor
@@ -50,7 +52,7 @@ function! ale#python#FindExecutable(buffer, base_var_name, path_list) abort
 
     if !empty(l:virtualenv)
         for l:path in a:path_list
-            let l:ve_executable = l:virtualenv . l:path
+            let l:ve_executable = simplify(l:virtualenv . '/' . s:bin_dir . '/' . l:path)
 
             if executable(l:ve_executable)
                 return l:ve_executable