# HG changeset patch
# User ZyX <[email protected]>
# Date 1369521415 -14400
# Node ID 0b272b1d066da1229ca6dd2519a3456b4a073f31
# Parent 484d93ca3c0244e847c101b6f550f8b8c94ae6f6
Make OutputWritelines support any sequence objects
diff -r 484d93ca3c02 -r 0b272b1d066d src/if_py_both.h
--- a/src/if_py_both.h Sun May 26 02:14:13 2013 +0400
+++ b/src/if_py_both.h Sun May 26 02:36:55 2013 +0400
@@ -312,36 +312,30 @@
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))
+
+ if (!(iterator = PyObject_GetIter(seq)))
+ return NULL;
+
+ while ((item = PyIter_Next(iterator)))
{
- PyErr_SetString(PyExc_TypeError, _("writelines() requires list of
strings"));
- Py_DECREF(list);
- return NULL;
- }
-
- n = PyList_Size(list);
-
- for (i = 0; i < n; ++i)
- {
- 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 @@
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 -r 484d93ca3c02 -r 0b272b1d066d src/testdir/test86.in
--- a/src/testdir/test86.in Sun May 26 02:14:13 2013 +0400
+++ b/src/testdir/test86.in Sun May 26 02:36:55 2013 +0400
@@ -709,6 +709,16 @@
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 -r 484d93ca3c02 -r 0b272b1d066d src/testdir/test86.ok
--- a/src/testdir/test86.ok Sun May 26 02:14:13 2013 +0400
+++ b/src/testdir/test86.ok Sun May 26 02:36:55 2013 +0400
@@ -391,6 +391,13 @@
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 -r 484d93ca3c02 -r 0b272b1d066d src/testdir/test87.in
--- a/src/testdir/test87.in Sun May 26 02:14:13 2013 +0400
+++ b/src/testdir/test87.in Sun May 26 02:36:55 2013 +0400
@@ -687,6 +687,16 @@
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 -r 484d93ca3c02 -r 0b272b1d066d src/testdir/test87.ok
--- a/src/testdir/test87.ok Sun May 26 02:14:13 2013 +0400
+++ b/src/testdir/test87.ok Sun May 26 02:36:55 2013 +0400
@@ -380,6 +380,13 @@
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',))
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
diff -cr vim.484d93ca3c02/src/if_py_both.h vim.0b272b1d066d/src/if_py_both.h
*** vim.484d93ca3c02/src/if_py_both.h 2013-05-26 12:07:47.076296052 +0400
--- vim.0b272b1d066d/src/if_py_both.h 2013-05-26 12:07:47.085295967 +0400
***************
*** 312,347 ****
static PyObject *
OutputWritelines(OutputObject *self, PyObject *args)
{
! PyInt n;
! PyInt i;
! PyObject *list;
int error = self->error;
! if (!PyArg_ParseTuple(args, "O", &list))
return NULL;
- Py_INCREF(list);
! if (!PyList_Check(list))
! {
! PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
! Py_DECREF(list);
return NULL;
- }
-
- n = PyList_Size(list);
! for (i = 0; i < n; ++i)
{
- PyObject *line = PyList_GetItem(list, i);
char *str = NULL;
PyInt len;
! if (!PyArg_Parse(line, "et#", ENC_OPT, &str, &len))
{
PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
! Py_DECREF(list);
return NULL;
}
Py_BEGIN_ALLOW_THREADS
Python_Lock_Vim();
--- 312,341 ----
static PyObject *
OutputWritelines(OutputObject *self, PyObject *args)
{
! PyObject *seq;
! PyObject *iterator;
! PyObject *item;
int error = self->error;
! if (!PyArg_ParseTuple(args, "O", &seq))
return NULL;
! if (!(iterator = PyObject_GetIter(seq)))
return NULL;
! while ((item = PyIter_Next(iterator)))
{
char *str = NULL;
PyInt len;
! if (!PyArg_Parse(item, "et#", ENC_OPT, &str, &len))
{
PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
! Py_DECREF(iterator);
! Py_DECREF(item);
return NULL;
}
+ Py_DECREF(item);
Py_BEGIN_ALLOW_THREADS
Python_Lock_Vim();
***************
*** 351,357 ****
PyMem_Free(str);
}
! Py_DECREF(list);
Py_INCREF(Py_None);
return Py_None;
}
--- 345,356 ----
PyMem_Free(str);
}
! Py_DECREF(iterator);
!
! /* Iterator may have finished due to an exception */
! if (PyErr_Occurred())
! return NULL;
!
Py_INCREF(Py_None);
return Py_None;
}
diff -cr vim.484d93ca3c02/src/testdir/test86.in vim.0b272b1d066d/src/testdir/test86.in
*** vim.484d93ca3c02/src/testdir/test86.in 2013-05-26 12:07:47.076296052 +0400
--- vim.0b272b1d066d/src/testdir/test86.in 2013-05-26 12:07:47.085295967 +0400
***************
*** 709,714 ****
--- 709,724 ----
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 -cr vim.484d93ca3c02/src/testdir/test86.ok vim.0b272b1d066d/src/testdir/test86.ok
*** vim.484d93ca3c02/src/testdir/test86.ok 2013-05-26 12:07:47.070296109 +0400
--- vim.0b272b1d066d/src/testdir/test86.ok 2013-05-26 12:07:47.079296024 +0400
***************
*** 391,396 ****
--- 391,403 ----
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 -cr vim.484d93ca3c02/src/testdir/test87.in vim.0b272b1d066d/src/testdir/test87.in
*** vim.484d93ca3c02/src/testdir/test87.in 2013-05-26 12:07:47.071296099 +0400
--- vim.0b272b1d066d/src/testdir/test87.in 2013-05-26 12:07:47.080296014 +0400
***************
*** 687,692 ****
--- 687,702 ----
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 -cr vim.484d93ca3c02/src/testdir/test87.ok vim.0b272b1d066d/src/testdir/test87.ok
*** vim.484d93ca3c02/src/testdir/test87.ok 2013-05-26 12:07:47.071296099 +0400
--- vim.0b272b1d066d/src/testdir/test87.ok 2013-05-26 12:07:47.081296005 +0400
***************
*** 380,385 ****
--- 380,392 ----
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',))
