0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

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)
This commit is contained in:
Bram Moolenaar
2017-01-28 16:06:38 +01:00
parent 0c0590d982
commit f42dd3c390
27 changed files with 602 additions and 11 deletions

View File

@@ -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,