aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.3.1057

Browse Source 
Problem:    Python: not enough compatibilty.
Solution:   Python patch 16: Make OutputWritelines support any sequence object
            (ZyX) Note: tests fail
This commit is contained in:
Bram Moolenaar
2013-05-30 12:26:58 +02:00
parent 9bb77d6fe6
commit 01a7a720ad
6 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/if_py_both.h
View File

@@ -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;
}