mirror of
https://github.com/neovim/neovim.git
synced 2025-09-07 20:08:17 +00:00
pyxversion: fix logic error #10759
Do not incorrectly prefer python2 if python3 is working. fixes #10758
This commit is contained in:

committed by
Justin M. Keyes

parent
ebcb9adcc4
commit
48b43352b0
@@ -13640,10 +13640,6 @@ static void f_pumvisible(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
*/
|
*/
|
||||||
static void f_pyeval(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
static void f_pyeval(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
||||||
{
|
{
|
||||||
if (p_pyx == 0) {
|
|
||||||
p_pyx = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
script_host_eval("python", argvars, rettv);
|
script_host_eval("python", argvars, rettv);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -13652,10 +13648,6 @@ static void f_pyeval(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
*/
|
*/
|
||||||
static void f_py3eval(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
static void f_py3eval(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
||||||
{
|
{
|
||||||
if (p_pyx == 0) {
|
|
||||||
p_pyx = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
script_host_eval("python3", argvars, rettv);
|
script_host_eval("python3", argvars, rettv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -2830,9 +2830,9 @@ void ex_options(exarg_T *eap)
|
|||||||
void init_pyxversion(void)
|
void init_pyxversion(void)
|
||||||
{
|
{
|
||||||
if (p_pyx == 0) {
|
if (p_pyx == 0) {
|
||||||
if (!eval_has_provider("python3")) {
|
if (eval_has_provider("python3")) {
|
||||||
p_pyx = 3;
|
p_pyx = 3;
|
||||||
} else if (!eval_has_provider("python")) {
|
} else if (eval_has_provider("python")) {
|
||||||
p_pyx = 2;
|
p_pyx = 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -90,6 +90,12 @@ describe('python3 provider', function()
|
|||||||
eq({1, 2, {['key'] = 'val'}}, eval([[py3eval('[1, 2, {"key": "val"}]')]]))
|
eq({1, 2, {['key'] = 'val'}}, eval([[py3eval('[1, 2, {"key": "val"}]')]]))
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
it('pyxeval #10758', function()
|
||||||
|
eq(0, eval([[&pyxversion]]))
|
||||||
|
eq(3, eval([[pyxeval('sys.version_info[:3][0]')]]))
|
||||||
|
eq(3, eval([[&pyxversion]]))
|
||||||
|
end)
|
||||||
|
|
||||||
it('RPC call to expand("<afile>") during BufDelete #5245 #5617', function()
|
it('RPC call to expand("<afile>") during BufDelete #5245 #5617', function()
|
||||||
source([=[
|
source([=[
|
||||||
python3 << EOF
|
python3 << EOF
|
||||||
|
Reference in New Issue
Block a user