summaryrefslogtreecommitdiff
path: root/src/if_python3.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-28 16:06:38 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-28 16:06:38 +0100
commitf42dd3c3901ea0ba38e67a616aea9953cae81b8d (patch)
tree3626ca40161dbfaa5e72a4dbeaa46b24480ddc8c /src/if_python3.c
parent0c0590d9827cb07a33c1552cb3558b94bddcb4dc (diff)
downloadvim-git-f42dd3c3901ea0ba38e67a616aea9953cae81b8d.tar.gz
patch 8.0.0251: not easy to select Python 2 or 3v8.0.0251
Problem: It is not so easy to write a script that works with both Python 2 and Python 3, even when the Python code works with both. Solution: Add 'pyxversion', :pyx, etc. (Marc Weber, Ken Takata)
Diffstat (limited to 'src/if_python3.c')
-rw-r--r--src/if_python3.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/if_python3.c b/src/if_python3.c
index 53a131348..d68ab85a8 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -1004,6 +1004,9 @@ ex_py3(exarg_T *eap)
{
char_u *script;
+ if (p_pyx == 0)
+ p_pyx = 3;
+
script = script_get(eap, eap->arg);
if (!eap->skip)
{
@@ -1028,6 +1031,9 @@ ex_py3file(exarg_T *eap)
char *p;
int i;
+ if (p_pyx == 0)
+ p_pyx = 3;
+
/* Have to do it like this. PyRun_SimpleFile requires you to pass a
* stdio file pointer, but Vim and the Python DLL are compiled with
* different options under Windows, meaning that stdio pointers aren't
@@ -1080,6 +1086,9 @@ ex_py3file(exarg_T *eap)
void
ex_py3do(exarg_T *eap)
{
+ if (p_pyx == 0)
+ p_pyx = 3;
+
DoPyCommand((char *)eap->arg,
(rangeinitializer)init_range_cmd,
(runner)run_do,