From e9a64b99fba995644c03ddbf7db94b7442cb2a18 Mon Sep 17 00:00:00 2001 From: Colin Kennedy Date: Wed, 7 Nov 2018 13:50:29 -0500 Subject: [PATCH 1/3] Changed 'pythonx' calls to use a variable, instead --- autoload/vim_block_party.vim | 40 ++++++++++++----------------- ftplugin/python/vim_block_party.vim | 22 +++++++++++++--- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/autoload/vim_block_party.vim b/autoload/vim_block_party.vim index 7d9d083..459de7f 100644 --- a/autoload/vim_block_party.vim +++ b/autoload/vim_block_party.vim @@ -1,10 +1,17 @@ +" Get a Python version to run with (Vim 8.0+ can just use `pythonx`) +if get(g:, 'expander_python_version', '2') == '2' && has('python') + let g:_uspy=":python " +elseif get(g:, 'expander_python_version', '3') == '3' && has('python3') + let g:_uspy=":python3 " +else + echoerr "No matching Python version could be found" +endif + + function! vim_block_party#around_deep() let l:block_party_temp_var = [] -pythonx << EOF -from vim_textobj_block_party import party -party.around_deep('l:block_party_temp_var') -EOF + execute g:_uspy "from vim_textobj_block_party import party;party.around_deep('l:block_party_temp_var')" if l:block_party_temp_var == [] return 0 @@ -17,10 +24,7 @@ endfunction function! vim_block_party#around_deep_two_way() let l:block_party_temp_var = [] -pythonx << EOF -from vim_textobj_block_party import party -party.around_deep('l:block_party_temp_var', two_way=True) -EOF + execute g:_uspy "from vim_textobj_block_party import party;party.around_deep('l:block_party_temp_var', two_way=True)" if l:block_party_temp_var == [] return 0 @@ -33,10 +37,7 @@ endfunction function! vim_block_party#inside_deep() let l:block_party_temp_var = [] -pythonx << EOF -from vim_textobj_block_party import party -party.inside_deep('l:block_party_temp_var') -EOF + execute g:_uspy "from vim_textobj_block_party import party;party.inside_deep('l:block_party_temp_var')" if l:block_party_temp_var == [] return 0 @@ -49,10 +50,7 @@ endfunction function! vim_block_party#around_shallow() let l:block_party_temp_var = [] -pythonx << EOF -from vim_textobj_block_party import party -party.around_shallow('l:block_party_temp_var') -EOF + execute g:_uspy "from vim_textobj_block_party import party;party.around_shallow('l:block_party_temp_var')" if len(l:block_party_temp_var) == 0 return 0 @@ -65,10 +63,7 @@ endfunction function! vim_block_party#around_shallow_two_way() let l:block_party_temp_var = [] -pythonx << EOF -from vim_textobj_block_party import party -party.around_shallow('l:block_party_temp_var', two_way=True) -EOF + execute g:_uspy "from vim_textobj_block_party import party;party.around_shallow('l:block_party_temp_var', two_way=True)" if l:block_party_temp_var == [] return 0 @@ -81,10 +76,7 @@ endfunction function! vim_block_party#inside_shallow() let l:block_party_temp_var = [] -pythonx << EOF -from vim_textobj_block_party import party -party.inside_shallow('l:block_party_temp_var') -EOF + execute g:_uspy "from vim_textobj_block_party import party;party.inside_shallow('l:block_party_temp_var')" if l:block_party_temp_var == [] return 0 diff --git a/ftplugin/python/vim_block_party.vim b/ftplugin/python/vim_block_party.vim index eeffe62..25e3aa0 100644 --- a/ftplugin/python/vim_block_party.vim +++ b/ftplugin/python/vim_block_party.vim @@ -1,13 +1,27 @@ +if !has('python') && !has('python3') + echoerr "vim-python-function-expander requires Python. Cannot continue loading this plugin" + finish +endif + if get(g:, 'block_party_loaded', '0') == '1' finish endif +" Get a Python version to run with (Vim 8.0+ can just use `pythonx`) +if get(g:, 'expander_python_version', '2') == '2' && has('python') + let g:_uspy=":python " +elseif get(g:, 'expander_python_version', '3') == '3' && has('python3') + let g:_uspy=":python3 " +else + echoerr "No matching Python version could be found" +endif + + function! s:SetupBlockParty() -pythonx << EOF -from vim_textobj_block_party import environment -environment.init() -EOF + " from vim_textobj_block_party import environment + " environment.init() + execute g:_uspy "from vim_textobj_block_party import environment;environment.init()" endfunction From eba2ab8f11908aa3e57e059192f9467f91bbdfe4 Mon Sep 17 00:00:00 2001 From: Colin Kennedy Date: Wed, 7 Nov 2018 23:51:39 -0500 Subject: [PATCH 2/3] block_party/party.py - Changed the parso import to use absolute imports because parso does not use relative imports --- pythonx/vim_textobj_block_party/block_party/party.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pythonx/vim_textobj_block_party/block_party/party.py b/pythonx/vim_textobj_block_party/block_party/party.py index 392543c..a556243 100644 --- a/pythonx/vim_textobj_block_party/block_party/party.py +++ b/pythonx/vim_textobj_block_party/block_party/party.py @@ -18,9 +18,12 @@ from parso.python import tree import parso except ImportError: - # Use the provided parso library if the user doesn't have it installed. - from .vendors.parso.python import tree - from .vendors import parso + import sys + import os + from . import vendors + sys.path.append(os.path.dirname(vendors.__file__)) + from parso.python import tree + import parso # IMPORT LOCAL LIBRARIES from . import config From 01a4312a1003ab0bdb454d03d8ff7e8b7b1911c8 Mon Sep 17 00:00:00 2001 From: Colin Kennedy Date: Wed, 7 Nov 2018 23:55:27 -0500 Subject: [PATCH 3/3] Removed an old comment. Ignore --- ftplugin/python/vim_block_party.vim | 2 -- 1 file changed, 2 deletions(-) diff --git a/ftplugin/python/vim_block_party.vim b/ftplugin/python/vim_block_party.vim index 25e3aa0..f9d2ec1 100644 --- a/ftplugin/python/vim_block_party.vim +++ b/ftplugin/python/vim_block_party.vim @@ -19,8 +19,6 @@ endif function! s:SetupBlockParty() - " from vim_textobj_block_party import environment - " environment.init() execute g:_uspy "from vim_textobj_block_party import environment;environment.init()" endfunction