mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-12 03:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

gh-101819: Prepare _io._IOBase for module state (#104386)

Browse Source 
- Add PyIOBase_Type to _io module state
- Pass defining class to _io._IOBase.fileno
This commit is contained in:
Erlend E. Aasland 2023-05-12 09:30:26 +02:00 committed by GitHub
parent 718b132772
commit 15795b57d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/_io/_iomodule.c
View File

@ -582,6 +582,7 @@ iomodule_traverse(PyObject *mod, visitproc visit, void *arg) {
return 0;
Py_VISIT(state->unsupported_operation);
Py_VISIT(state->PyIOBase_Type);
Py_VISIT(state->PyIncrementalNewlineDecoder_Type);
Py_VISIT(state->PyRawIOBase_Type);
Py_VISIT(state->PyBufferedIOBase_Type);
@ -609,6 +610,7 @@ iomodule_clear(PyObject *mod) {
return 0;
Py_CLEAR(state->unsupported_operation);
Py_CLEAR(state->PyIOBase_Type);
Py_CLEAR(state->PyIncrementalNewlineDecoder_Type);
Py_CLEAR(state->PyRawIOBase_Type);
Py_CLEAR(state->PyBufferedIOBase_Type);
@ -751,6 +753,7 @@ PyInit__io(void)
}
// Base classes
state->PyIOBase_Type = (PyTypeObject *)Py_NewRef(&PyIOBase_Type);
ADD_TYPE(m, state->PyIncrementalNewlineDecoder_Type, &nldecoder_spec, NULL);
ADD_TYPE(m, state->PyBytesIOBuffer_Type, &bytesiobuf_spec, NULL);

1
Modules/_io/_iomodule.h
View File

@ -149,6 +149,7 @@ struct _io_state {
PyObject *unsupported_operation;
/* Types */
PyTypeObject *PyIOBase_Type;
PyTypeObject *PyIncrementalNewlineDecoder_Type;
PyTypeObject *PyRawIOBase_Type;
PyTypeObject *PyBufferedIOBase_Type;

18
Modules/_io/clinic/iobase.c.h generated
View File

@ -231,20 +231,24 @@ PyDoc_STRVAR(_io__IOBase_fileno__doc__,
"fileno($self, /)\n"
"--\n"
"\n"
"Returns underlying file descriptor if one exists.\n"
"Return underlying file descriptor if one exists.\n"
"\n"
"OSError is raised if the IO object does not use a file descriptor.");
"Raise OSError if the IO object does not use a file descriptor.");
#define _IO__IOBASE_FILENO_METHODDEF \
{"fileno", (PyCFunction)_io__IOBase_fileno, METH_NOARGS, _io__IOBase_fileno__doc__},
{"fileno", _PyCFunction_CAST(_io__IOBase_fileno), METH_METHOD|METH_FASTCALL|METH_KEYWORDS, _io__IOBase_fileno__doc__},
static PyObject *
_io__IOBase_fileno_impl(PyObject *self);
_io__IOBase_fileno_impl(PyObject *self, PyTypeObject *cls);
static PyObject *
_io__IOBase_fileno(PyObject *self, PyObject *Py_UNUSED(ignored))
_io__IOBase_fileno(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
{
return _io__IOBase_fileno_impl(self);
if (nargs) {
PyErr_SetString(PyExc_TypeError, "fileno() takes no arguments");
return NULL;
}
return _io__IOBase_fileno_impl(self, cls);
}
PyDoc_STRVAR(_io__IOBase_isatty__doc__,
@ -416,4 +420,4 @@ _io__RawIOBase_readall(PyObject *self, PyObject *Py_UNUSED(ignored))
{
return _io__RawIOBase_readall_impl(self);
}
/*[clinic end generated code: output=b6d4845254da1da2 input=a9049054013a1b77]*/
/*[clinic end generated code: output=63bc25a5bfcecaf0 input=a9049054013a1b77]*/

10
Modules/_io/iobase.c
View File

@ -511,15 +511,17 @@ iobase_exit(PyObject *self, PyObject *args)
/*[clinic input]
_io._IOBase.fileno
cls: defining_class
/
Returns underlying file descriptor if one exists.
Return underlying file descriptor if one exists.
OSError is raised if the IO object does not use a file descriptor.
Raise OSError if the IO object does not use a file descriptor.
[clinic start generated code]*/
static PyObject *
_io__IOBase_fileno_impl(PyObject *self)
/*[clinic end generated code: output=7cc0973f0f5f3b73 input=4e37028947dc1cc8]*/
_io__IOBase_fileno_impl(PyObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=7caaa32a6f4ada3d input=1927c8bea5c85099]*/
{
_PyIO_State *state = IO_STATE();
return iobase_unsupported(state, "fileno");