Mercurial > vim
changeset 8967:df5f9284fcba v7.4.1769
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 21 20:00:56 2016 +0200
patch 7.4.1769
Problem: No "closed", "errors" and "encoding" attribute on Python output.
Solution: Add attributes and more tests. (Roland Puntaier, closes https://github.com/vim/vim/issues/622)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 21 Apr 2016 20:15:05 +0200 |
| parents | 2aff38480967 |
| children | 4794235d1bb0 |
| files | src/if_py_both.h src/if_python.c src/if_python3.c src/testdir/test86.in src/testdir/test86.ok src/testdir/test87.in src/testdir/test87.ok src/version.c |
| diffstat | 8 files changed, 33 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -503,6 +503,7 @@ static struct PyMethodDef OutputMethods[ {"readable", (PyCFunction)AlwaysFalse, METH_NOARGS, ""}, {"seekable", (PyCFunction)AlwaysFalse, METH_NOARGS, ""}, {"writable", (PyCFunction)AlwaysTrue, METH_NOARGS, ""}, + {"closed", (PyCFunction)AlwaysFalse, METH_NOARGS, ""}, {"__dir__", (PyCFunction)OutputDir, METH_NOARGS, ""}, { NULL, NULL, 0, NULL} };
--- a/src/if_python.c +++ b/src/if_python.c @@ -1195,7 +1195,10 @@ OutputGetattr(PyObject *self, char *name return PyInt_FromLong(((OutputObject *)(self))->softspace); else if (strcmp(name, "__members__") == 0) return ObjectDir(NULL, OutputAttrs); - + else if (strcmp(name, "errors") == 0) + return PyString_FromString("strict"); + else if (strcmp(name, "encoding") == 0) + return PyString_FromString(ENC_OPT); return Py_FindMethod(OutputMethods, self, name); }
--- a/src/if_python3.c +++ b/src/if_python3.c @@ -1100,6 +1100,10 @@ OutputGetattro(PyObject *self, PyObject if (strcmp(name, "softspace") == 0) return PyLong_FromLong(((OutputObject *)(self))->softspace); + else if (strcmp(name, "errors") == 0) + return PyString_FromString("strict"); + else if (strcmp(name, "encoding") == 0) + return PyString_FromString(ENC_OPT); return PyObject_GenericGetAttr(self, nameobj); }
--- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -1289,6 +1289,11 @@ ee('assert sys.stdout.writable()==True') ee('assert sys.stdout.readable()==False') ee('assert sys.stderr.writable()==True') ee('assert sys.stderr.readable()==False') +ee('assert sys.stdout.closed()==False') +ee('assert sys.stderr.closed()==False') +ee('assert sys.stdout.errors=="strict"') +ee('assert sys.stderr.errors=="strict"') +ee('assert sys.stdout.encoding==sys.stderr.encoding') ee('sys.stdout.write(None)') cb.append(">> OutputWriteLines") ee('sys.stdout.writelines(None)')
--- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -449,7 +449,7 @@ range:__dir__,__members__,append,end,sta dictionary:__dir__,__members__,get,has_key,items,keys,locked,pop,popitem,scope,update,values list:__dir__,__members__,extend,locked function:__dir__,__members__,args,self,softspace -output:__dir__,__members__,close,flush,isatty,readable,seekable,softspace,writable,write,writelines +output:__dir__,__members__,close,closed,flush,isatty,readable,seekable,softspace,writable,write,writelines {} {'a': 1} {'a': 1} @@ -600,6 +600,11 @@ assert sys.stdout.writable()==True:NOT F assert sys.stdout.readable()==False:NOT FAILED assert sys.stderr.writable()==True:NOT FAILED assert sys.stderr.readable()==False:NOT FAILED +assert sys.stdout.closed()==False:NOT FAILED +assert sys.stderr.closed()==False:NOT FAILED +assert sys.stdout.errors=="strict":NOT FAILED +assert sys.stderr.errors=="strict":NOT FAILED +assert sys.stdout.encoding==sys.stderr.encoding:NOT FAILED sys.stdout.write(None):TypeError:('coercing to Unicode: need string or buffer, NoneType found',) >> OutputWriteLines sys.stdout.writelines(None):TypeError:("'NoneType' object is not iterable",)
--- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -1283,6 +1283,11 @@ ee('assert sys.stdout.writable()==True') ee('assert sys.stdout.readable()==False') ee('assert sys.stderr.writable()==True') ee('assert sys.stderr.readable()==False') +ee('assert sys.stdout.closed()==False') +ee('assert sys.stderr.closed()==False') +ee('assert sys.stdout.errors=="strict"') +ee('assert sys.stderr.errors=="strict"') +ee('assert sys.stdout.encoding==sys.stderr.encoding') ee('sys.stdout.write(None)') cb.append(">> OutputWriteLines") ee('sys.stdout.writelines(None)')
--- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -449,7 +449,7 @@ range:__dir__,append,end,start dictionary:__dir__,get,has_key,items,keys,locked,pop,popitem,scope,update,values list:__dir__,extend,locked function:__dir__,args,self,softspace -output:__dir__,close,flush,isatty,readable,seekable,softspace,writable,write,writelines +output:__dir__,close,closed,flush,isatty,readable,seekable,softspace,writable,write,writelines {} {'a': 1} {'a': 1} @@ -600,6 +600,11 @@ assert sys.stdout.writable()==True:NOT F assert sys.stdout.readable()==False:NOT FAILED assert sys.stderr.writable()==True:NOT FAILED assert sys.stderr.readable()==False:NOT FAILED +assert sys.stdout.closed()==False:NOT FAILED +assert sys.stderr.closed()==False:NOT FAILED +assert sys.stdout.errors=="strict":NOT FAILED +assert sys.stderr.errors=="strict":NOT FAILED +assert sys.stdout.encoding==sys.stderr.encoding:NOT FAILED sys.stdout.write(None):(<class 'TypeError'>, TypeError("Can't convert 'NoneType' object to str implicitly",)) >> OutputWriteLines sys.stdout.writelines(None):(<class 'TypeError'>, TypeError("'NoneType' object is not iterable",))