Mercurial > vim
diff src/if_python.c @ 10722:7598ce51bf2a v8.0.0251
patch 8.0.0251: not easy to select Python 2 or 3
commit https://github.com/vim/vim/commit/f42dd3c3901ea0ba38e67a616aea9953cae81b8d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 28 16:06:38 2017 +0100
patch 8.0.0251: not easy to select Python 2 or 3
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 28 Jan 2017 16:15:04 +0100 |
| parents | df5f9284fcba |
| children | 3b53bb2a0e39 |
line wrap: on
line diff
--- a/src/if_python.c +++ b/src/if_python.c @@ -1114,6 +1114,9 @@ ex_python(exarg_T *eap) { char_u *script; + if (p_pyx == 0) + p_pyx = 2; + script = script_get(eap, eap->arg); if (!eap->skip) { @@ -1137,6 +1140,9 @@ ex_pyfile(exarg_T *eap) const char *file = (char *)eap->arg; char *p; + if (p_pyx == 0) + p_pyx = 2; + /* 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 @@ -1175,6 +1181,9 @@ ex_pyfile(exarg_T *eap) void ex_pydo(exarg_T *eap) { + if (p_pyx == 0) + p_pyx = 2; + DoPyCommand((char *)eap->arg, (rangeinitializer) init_range_cmd, (runner)run_do,