updated for version 7.3.1057

Problem:    Python: not enough compatibilty.
Solution:   Python patch 16: Make OutputWritelines support any sequence object
            (ZyX) Note: tests fail

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 2ad19c4062255b502b1610ac5bd3f045b6f3a1d2..7d3a26ebf743a7cdf8655a25bec5321151339b11 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -312,36 +312,30 @@ OutputWrite(OutputObject *self, PyObject *args)
     static PyObject *
 OutputWritelines(OutputObject *self, PyObject *args)
 {
-    PyInt n;
-    PyInt i;
-    PyObject *list;
+    PyObject   *seq;
+    PyObject   *iterator;
+    PyObject   *item;
     int error = self->error;
 
-    if (!PyArg_ParseTuple(args, "O", &list))
+    if (!PyArg_ParseTuple(args, "O", &seq))
        return NULL;
-    Py_INCREF(list);
 
-    if (!PyList_Check(list))
-    {
-       PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
-       Py_DECREF(list);
+    if (!(iterator = PyObject_GetIter(seq)))
        return NULL;
-    }
-
-    n = PyList_Size(list);
 
-    for (i = 0; i < n; ++i)
+    while ((item = PyIter_Next(iterator)))
     {
-       PyObject *line = PyList_GetItem(list, i);
        char *str = NULL;
        PyInt len;
 
-       if (!PyArg_Parse(line, "et#", ENC_OPT, &str, &len))
+       if (!PyArg_Parse(item, "et#", ENC_OPT, &str, &len))
        {
            PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
-           Py_DECREF(list);
+           Py_DECREF(iterator);
+           Py_DECREF(item);
            return NULL;
        }
+       Py_DECREF(item);
 
        Py_BEGIN_ALLOW_THREADS
        Python_Lock_Vim();
@@ -351,7 +345,12 @@ OutputWritelines(OutputObject *self, PyObject *args)
        PyMem_Free(str);
     }
 
-    Py_DECREF(list);
+    Py_DECREF(iterator);
+
+    /* Iterator may have finished due to an exception */
+    if (PyErr_Occurred())
+       return NULL;
+
     Py_INCREF(Py_None);
     return Py_None;
 }

diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index 45c345f292780a96a681f69d25bf8d45b07e366d..cf97686220728125a5f2949f7e9c13b74d398d72 100644 (file)
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -709,6 +709,16 @@ del name
 del o
 EOF
 :"
+:"
+:" Test stdout/stderr
+:redir => messages
+:py sys.stdout.write('abc') ; sys.stdout.write('def')
+:py sys.stderr.write('abc') ; sys.stderr.write('def')
+:py sys.stdout.writelines(iter('abc'))
+:py sys.stderr.writelines(iter('abc'))
+:redir END
+:$put =string(substitute(messages, '\d\+', '', 'g'))
+:"
 :" Test exceptions
 :fun Exe(e)
 :   execute a:e

diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index 0b79b0dbf1d8b6c26ba4494676d1675aca3bca32..fb94c3af106a8dffe0ffc062f4b215e2566c16a9 100644 (file)
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -391,6 +391,13 @@ dictionary:__dir__,__members__,keys,locked,scope
 list:__dir__,__members__,extend,locked
 function:__call__,__dir__,__members__,softspace
 output:__dir__,__members__,flush,softspace,write,writelines
+'
+abcdef
+line  :
+abcdef
+abc
+line  :
+abc'
 (<class 'vim.error'>, error('abc',))
 (<class 'vim.error'>, error('def',))
 (<class 'vim.error'>, error('ghi',))

diff --git a/src/testdir/test87.in b/src/testdir/test87.in
index 210c055d755ddf17d8a73893e93ea3fe0fdf1862..b1763edc72c784f5e24699338b9d77432f3c8733 100644 (file)
--- a/src/testdir/test87.in
+++ b/src/testdir/test87.in
@@ -687,6 +687,16 @@ del name
 del o
 EOF
 :"
+:"
+:" Test stdout/stderr
+:redir => messages
+:py sys.stdout.write('abc') ; sys.stdout.write('def')
+:py sys.stderr.write('abc') ; sys.stderr.write('def')
+:py sys.stdout.writelines(iter('abc'))
+:py sys.stderr.writelines(iter('abc'))
+:redir END
+:$put =string(substitute(messages, '\d\+', '', 'g'))
+:"
 :" Test exceptions
 :fun Exe(e)
 :   execute a:e

diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index 3126fd36f7e56b1a34d3a5353e1aca125dac8961..8ae7a8cb65ec679f5547f250c6ee9619c9a8b8a0 100644 (file)
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -380,6 +380,13 @@ dictionary:__dir__,keys,locked,scope
 list:__dir__,extend,locked
 function:__call__,__dir__,softspace
 output:__dir__,flush,softspace,write,writelines
+'
+abcdef
+line  :
+abcdef
+abc
+line  :
+abc'
 (<class 'vim.error'>, error('abc',))
 (<class 'vim.error'>, error('def',))
 (<class 'vim.error'>, error('ghi',))

diff --git a/src/version.c b/src/version.c
index c33c1a687876c098a856142234a9a696883c5518..4d5539a90c9cd9df30f534a6beaaa9c27e518186 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1057,
 /**/
     1056,
 /**/