move to a naming scheme with all lowercase and underscores
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 220af8d..0f5a73d 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -13,7 +13,7 @@
/* TextIOBase */
-PyDoc_STRVAR(TextIOBase_doc,
+PyDoc_STRVAR(textiobase_doc,
"Base class for text I/O.\n"
"\n"
"This class provides a character and line based interface to stream\n"
@@ -28,7 +28,7 @@
return NULL;
}
-PyDoc_STRVAR(TextIOBase_detach_doc,
+PyDoc_STRVAR(textiobase_detach_doc,
"Separate the underlying buffer from the TextIOBase and return it.\n"
"\n"
"After the underlying buffer has been detached, the TextIO is in an\n"
@@ -36,12 +36,12 @@
);
static PyObject *
-TextIOBase_detach(PyObject *self)
+textiobase_detach(PyObject *self)
{
return _unsupported("detach");
}
-PyDoc_STRVAR(TextIOBase_read_doc,
+PyDoc_STRVAR(textiobase_read_doc,
"Read at most n characters from stream.\n"
"\n"
"Read from underlying buffer until we have n characters or we hit EOF.\n"
@@ -49,48 +49,48 @@
);
static PyObject *
-TextIOBase_read(PyObject *self, PyObject *args)
+textiobase_read(PyObject *self, PyObject *args)
{
return _unsupported("read");
}
-PyDoc_STRVAR(TextIOBase_readline_doc,
+PyDoc_STRVAR(textiobase_readline_doc,
"Read until newline or EOF.\n"
"\n"
"Returns an empty string if EOF is hit immediately.\n"
);
static PyObject *
-TextIOBase_readline(PyObject *self, PyObject *args)
+textiobase_readline(PyObject *self, PyObject *args)
{
return _unsupported("readline");
}
-PyDoc_STRVAR(TextIOBase_write_doc,
+PyDoc_STRVAR(textiobase_write_doc,
"Write string to stream.\n"
"Returns the number of characters written (which is always equal to\n"
"the length of the string).\n"
);
static PyObject *
-TextIOBase_write(PyObject *self, PyObject *args)
+textiobase_write(PyObject *self, PyObject *args)
{
return _unsupported("write");
}
-PyDoc_STRVAR(TextIOBase_encoding_doc,
+PyDoc_STRVAR(textiobase_encoding_doc,
"Encoding of the text stream.\n"
"\n"
"Subclasses should override.\n"
);
static PyObject *
-TextIOBase_encoding_get(PyObject *self, void *context)
+textiobase_encoding_get(PyObject *self, void *context)
{
Py_RETURN_NONE;
}
-PyDoc_STRVAR(TextIOBase_newlines_doc,
+PyDoc_STRVAR(textiobase_newlines_doc,
"Line endings translated so far.\n"
"\n"
"Only line endings translated during reading are considered.\n"
@@ -99,36 +99,36 @@
);
static PyObject *
-TextIOBase_newlines_get(PyObject *self, void *context)
+textiobase_newlines_get(PyObject *self, void *context)
{
Py_RETURN_NONE;
}
-PyDoc_STRVAR(TextIOBase_errors_doc,
+PyDoc_STRVAR(textiobase_errors_doc,
"The error setting of the decoder or encoder.\n"
"\n"
"Subclasses should override.\n"
);
static PyObject *
-TextIOBase_errors_get(PyObject *self, void *context)
+textiobase_errors_get(PyObject *self, void *context)
{
Py_RETURN_NONE;
}
-static PyMethodDef TextIOBase_methods[] = {
- {"detach", (PyCFunction)TextIOBase_detach, METH_NOARGS, TextIOBase_detach_doc},
- {"read", TextIOBase_read, METH_VARARGS, TextIOBase_read_doc},
- {"readline", TextIOBase_readline, METH_VARARGS, TextIOBase_readline_doc},
- {"write", TextIOBase_write, METH_VARARGS, TextIOBase_write_doc},
+static PyMethodDef textiobase_methods[] = {
+ {"detach", (PyCFunction)textiobase_detach, METH_NOARGS, textiobase_detach_doc},
+ {"read", textiobase_read, METH_VARARGS, textiobase_read_doc},
+ {"readline", textiobase_readline, METH_VARARGS, textiobase_readline_doc},
+ {"write", textiobase_write, METH_VARARGS, textiobase_write_doc},
{NULL, NULL}
};
-static PyGetSetDef TextIOBase_getset[] = {
- {"encoding", (getter)TextIOBase_encoding_get, NULL, TextIOBase_encoding_doc},
- {"newlines", (getter)TextIOBase_newlines_get, NULL, TextIOBase_newlines_doc},
- {"errors", (getter)TextIOBase_errors_get, NULL, TextIOBase_errors_doc},
+static PyGetSetDef textiobase_getset[] = {
+ {"encoding", (getter)textiobase_encoding_get, NULL, textiobase_encoding_doc},
+ {"newlines", (getter)textiobase_newlines_get, NULL, textiobase_newlines_doc},
+ {"errors", (getter)textiobase_errors_get, NULL, textiobase_errors_doc},
{NULL}
};
@@ -153,16 +153,16 @@
0, /*tp_setattro*/
0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
- TextIOBase_doc, /* tp_doc */
+ textiobase_doc, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
- TextIOBase_methods, /* tp_methods */
+ textiobase_methods, /* tp_methods */
0, /* tp_members */
- TextIOBase_getset, /* tp_getset */
+ textiobase_getset, /* tp_getset */
&PyIOBase_Type, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
@@ -176,7 +176,7 @@
/* IncrementalNewlineDecoder */
-PyDoc_STRVAR(IncrementalNewlineDecoder_doc,
+PyDoc_STRVAR(incrementalnewlinedecoder_doc,
"Codec used when reading a file in universal newlines mode. It wraps\n"
"another incremental decoder, translating \\r\\n and \\r into \\n. It also\n"
"records the types of newlines encountered. When used with\n"
@@ -193,10 +193,10 @@
int pendingcr:1;
int translate:1;
unsigned int seennl:3;
-} PyNewLineDecoderObject;
+} nldecoder_object;
static int
-IncrementalNewlineDecoder_init(PyNewLineDecoderObject *self,
+incrementalnewlinedecoder_init(nldecoder_object *self,
PyObject *args, PyObject *kwds)
{
PyObject *decoder;
@@ -229,7 +229,7 @@
}
static void
-IncrementalNewlineDecoder_dealloc(PyNewLineDecoderObject *self)
+incrementalnewlinedecoder_dealloc(nldecoder_object *self)
{
Py_CLEAR(self->decoder);
Py_CLEAR(self->errors);
@@ -247,7 +247,7 @@
{
PyObject *output;
Py_ssize_t output_len;
- PyNewLineDecoderObject *self = (PyNewLineDecoderObject *) _self;
+ nldecoder_object *self = (nldecoder_object *) _self;
if (self->decoder == NULL) {
PyErr_SetString(PyExc_ValueError,
@@ -460,7 +460,7 @@
}
static PyObject *
-IncrementalNewlineDecoder_decode(PyNewLineDecoderObject *self,
+incrementalnewlinedecoder_decode(nldecoder_object *self,
PyObject *args, PyObject *kwds)
{
char *kwlist[] = {"input", "final", NULL};
@@ -474,7 +474,7 @@
}
static PyObject *
-IncrementalNewlineDecoder_getstate(PyNewLineDecoderObject *self, PyObject *args)
+incrementalnewlinedecoder_getstate(nldecoder_object *self, PyObject *args)
{
PyObject *buffer;
unsigned PY_LONG_LONG flag;
@@ -502,7 +502,7 @@
}
static PyObject *
-IncrementalNewlineDecoder_setstate(PyNewLineDecoderObject *self, PyObject *state)
+incrementalnewlinedecoder_setstate(nldecoder_object *self, PyObject *state)
{
PyObject *buffer;
unsigned PY_LONG_LONG flag;
@@ -521,7 +521,7 @@
}
static PyObject *
-IncrementalNewlineDecoder_reset(PyNewLineDecoderObject *self, PyObject *args)
+incrementalnewlinedecoder_reset(nldecoder_object *self, PyObject *args)
{
self->seennl = 0;
self->pendingcr = 0;
@@ -532,7 +532,7 @@
}
static PyObject *
-IncrementalNewlineDecoder_newlines_get(PyNewLineDecoderObject *self, void *context)
+incrementalnewlinedecoder_newlines_get(nldecoder_object *self, void *context)
{
switch (self->seennl) {
case SEEN_CR:
@@ -556,25 +556,25 @@
}
-static PyMethodDef IncrementalNewlineDecoder_methods[] = {
- {"decode", (PyCFunction)IncrementalNewlineDecoder_decode, METH_VARARGS|METH_KEYWORDS},
- {"getstate", (PyCFunction)IncrementalNewlineDecoder_getstate, METH_NOARGS},
- {"setstate", (PyCFunction)IncrementalNewlineDecoder_setstate, METH_O},
- {"reset", (PyCFunction)IncrementalNewlineDecoder_reset, METH_NOARGS},
+static PyMethodDef incrementalnewlinedecoder_methods[] = {
+ {"decode", (PyCFunction)incrementalnewlinedecoder_decode, METH_VARARGS|METH_KEYWORDS},
+ {"getstate", (PyCFunction)incrementalnewlinedecoder_getstate, METH_NOARGS},
+ {"setstate", (PyCFunction)incrementalnewlinedecoder_setstate, METH_O},
+ {"reset", (PyCFunction)incrementalnewlinedecoder_reset, METH_NOARGS},
{NULL}
};
-static PyGetSetDef IncrementalNewlineDecoder_getset[] = {
- {"newlines", (getter)IncrementalNewlineDecoder_newlines_get, NULL, NULL},
+static PyGetSetDef incrementalnewlinedecoder_getset[] = {
+ {"newlines", (getter)incrementalnewlinedecoder_newlines_get, NULL, NULL},
{NULL}
};
PyTypeObject PyIncrementalNewlineDecoder_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_io.IncrementalNewlineDecoder", /*tp_name*/
- sizeof(PyNewLineDecoderObject), /*tp_basicsize*/
+ sizeof(nldecoder_object), /*tp_basicsize*/
0, /*tp_itemsize*/
- (destructor)IncrementalNewlineDecoder_dealloc, /*tp_dealloc*/
+ (destructor)incrementalnewlinedecoder_dealloc, /*tp_dealloc*/
0, /*tp_print*/
0, /*tp_getattr*/
0, /*tp_setattr*/
@@ -590,22 +590,22 @@
0, /*tp_setattro*/
0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
- IncrementalNewlineDecoder_doc, /* tp_doc */
+ incrementalnewlinedecoder_doc, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /*tp_weaklistoffset*/
0, /* tp_iter */
0, /* tp_iternext */
- IncrementalNewlineDecoder_methods, /* tp_methods */
+ incrementalnewlinedecoder_methods, /* tp_methods */
0, /* tp_members */
- IncrementalNewlineDecoder_getset, /* tp_getset */
+ incrementalnewlinedecoder_getset, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
- (initproc)IncrementalNewlineDecoder_init, /* tp_init */
+ (initproc)incrementalnewlinedecoder_init, /* tp_init */
0, /* tp_alloc */
PyType_GenericNew, /* tp_new */
};
@@ -613,7 +613,7 @@
/* TextIOWrapper */
-PyDoc_STRVAR(TextIOWrapper_doc,
+PyDoc_STRVAR(textiowrapper_doc,
"Character and line based layer over a BufferedIOBase object, buffer.\n"
"\n"
"encoding gives the name of the encoding that the stream will be\n"
@@ -689,14 +689,14 @@
PyObject *weakreflist;
PyObject *dict;
-} PyTextIOWrapperObject;
+} textio;
/* A couple of specialized cases in order to bypass the slow incremental
encoding methods for the most popular encodings. */
static PyObject *
-ascii_encode(PyTextIOWrapperObject *self, PyObject *text)
+ascii_encode(textio *self, PyObject *text)
{
return PyUnicode_EncodeASCII(PyUnicode_AS_UNICODE(text),
PyUnicode_GET_SIZE(text),
@@ -704,7 +704,7 @@
}
static PyObject *
-utf16be_encode(PyTextIOWrapperObject *self, PyObject *text)
+utf16be_encode(textio *self, PyObject *text)
{
return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(text),
PyUnicode_GET_SIZE(text),
@@ -712,7 +712,7 @@
}
static PyObject *
-utf16le_encode(PyTextIOWrapperObject *self, PyObject *text)
+utf16le_encode(textio *self, PyObject *text)
{
return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(text),
PyUnicode_GET_SIZE(text),
@@ -720,7 +720,7 @@
}
static PyObject *
-utf16_encode(PyTextIOWrapperObject *self, PyObject *text)
+utf16_encode(textio *self, PyObject *text)
{
if (!self->encoding_start_of_stream) {
/* Skip the BOM and use native byte ordering */
@@ -736,7 +736,7 @@
}
static PyObject *
-utf32be_encode(PyTextIOWrapperObject *self, PyObject *text)
+utf32be_encode(textio *self, PyObject *text)
{
return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(text),
PyUnicode_GET_SIZE(text),
@@ -744,7 +744,7 @@
}
static PyObject *
-utf32le_encode(PyTextIOWrapperObject *self, PyObject *text)
+utf32le_encode(textio *self, PyObject *text)
{
return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(text),
PyUnicode_GET_SIZE(text),
@@ -752,7 +752,7 @@
}
static PyObject *
-utf32_encode(PyTextIOWrapperObject *self, PyObject *text)
+utf32_encode(textio *self, PyObject *text)
{
if (!self->encoding_start_of_stream) {
/* Skip the BOM and use native byte ordering */
@@ -768,7 +768,7 @@
}
static PyObject *
-utf8_encode(PyTextIOWrapperObject *self, PyObject *text)
+utf8_encode(textio *self, PyObject *text)
{
return PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(text),
PyUnicode_GET_SIZE(text),
@@ -776,7 +776,7 @@
}
static PyObject *
-latin1_encode(PyTextIOWrapperObject *self, PyObject *text)
+latin1_encode(textio *self, PyObject *text)
{
return PyUnicode_EncodeLatin1(PyUnicode_AS_UNICODE(text),
PyUnicode_GET_SIZE(text),
@@ -805,7 +805,7 @@
static int
-TextIOWrapper_init(PyTextIOWrapperObject *self, PyObject *args, PyObject *kwds)
+textiowrapper_init(textio *self, PyObject *args, PyObject *kwds)
{
char *kwlist[] = {"buffer", "encoding", "errors",
"newline", "line_buffering",
@@ -1068,7 +1068,7 @@
}
static int
-_TextIOWrapper_clear(PyTextIOWrapperObject *self)
+_textiowrapper_clear(textio *self)
{
if (self->ok && _PyIOBase_finalize((PyObject *) self) < 0)
return -1;
@@ -1087,9 +1087,9 @@
}
static void
-TextIOWrapper_dealloc(PyTextIOWrapperObject *self)
+textiowrapper_dealloc(textio *self)
{
- if (_TextIOWrapper_clear(self) < 0)
+ if (_textiowrapper_clear(self) < 0)
return;
_PyObject_GC_UNTRACK(self);
if (self->weakreflist != NULL)
@@ -1099,7 +1099,7 @@
}
static int
-TextIOWrapper_traverse(PyTextIOWrapperObject *self, visitproc visit, void *arg)
+textiowrapper_traverse(textio *self, visitproc visit, void *arg)
{
Py_VISIT(self->buffer);
Py_VISIT(self->encoding);
@@ -1117,16 +1117,16 @@
}
static int
-TextIOWrapper_clear(PyTextIOWrapperObject *self)
+textiowrapper_clear(textio *self)
{
- if (_TextIOWrapper_clear(self) < 0)
+ if (_textiowrapper_clear(self) < 0)
return -1;
Py_CLEAR(self->dict);
return 0;
}
static PyObject *
-TextIOWrapper_closed_get(PyTextIOWrapperObject *self, void *context);
+textiowrapper_closed_get(textio *self, void *context);
/* This macro takes some shortcuts to make the common case faster. */
#define CHECK_CLOSED(self) \
@@ -1137,7 +1137,7 @@
if (self->raw != NULL) \
r = _PyFileIO_closed(self->raw); \
else { \
- _res = TextIOWrapper_closed_get(self, NULL); \
+ _res = textiowrapper_closed_get(self, NULL); \
if (_res == NULL) \
return NULL; \
r = PyObject_IsTrue(_res); \
@@ -1151,7 +1151,7 @@
return NULL; \
} \
} \
- else if (_PyIOBase_checkClosed((PyObject *)self, Py_True) == NULL) \
+ else if (_PyIOBase_check_closed((PyObject *)self, Py_True) == NULL) \
return NULL; \
} while (0)
@@ -1181,7 +1181,7 @@
static PyObject *
-TextIOWrapper_detach(PyTextIOWrapperObject *self)
+textiowrapper_detach(textio *self)
{
PyObject *buffer, *res;
CHECK_INITIALIZED(self);
@@ -1211,7 +1211,7 @@
/* Flush the internal write buffer. This doesn't explicitly flush the
underlying buffered object, though. */
static int
-_TextIOWrapper_writeflush(PyTextIOWrapperObject *self)
+_textiowrapper_writeflush(textio *self)
{
PyObject *b, *ret;
@@ -1232,7 +1232,7 @@
}
static PyObject *
-TextIOWrapper_write(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_write(textio *self, PyObject *args)
{
PyObject *ret;
PyObject *text; /* owned reference */
@@ -1305,7 +1305,7 @@
self->pending_bytes_count += PyBytes_GET_SIZE(b);
Py_DECREF(b);
if (self->pending_bytes_count > self->chunk_size || needflush) {
- if (_TextIOWrapper_writeflush(self) < 0)
+ if (_textiowrapper_writeflush(self) < 0)
return NULL;
}
@@ -1331,7 +1331,7 @@
/* Steal a reference to chars and store it in the decoded_char buffer;
*/
static void
-TextIOWrapper_set_decoded_chars(PyTextIOWrapperObject *self, PyObject *chars)
+textiowrapper_set_decoded_chars(textio *self, PyObject *chars)
{
Py_CLEAR(self->decoded_chars);
self->decoded_chars = chars;
@@ -1339,7 +1339,7 @@
}
static PyObject *
-TextIOWrapper_get_decoded_chars(PyTextIOWrapperObject *self, Py_ssize_t n)
+textiowrapper_get_decoded_chars(textio *self, Py_ssize_t n)
{
PyObject *chars;
Py_ssize_t avail;
@@ -1374,7 +1374,7 @@
/* Read and decode the next chunk of data from the BufferedReader.
*/
static int
-TextIOWrapper_read_chunk(PyTextIOWrapperObject *self)
+textiowrapper_read_chunk(textio *self)
{
PyObject *dec_buffer = NULL;
PyObject *dec_flags = NULL;
@@ -1439,7 +1439,7 @@
/* TODO sanity check: isinstance(decoded_chars, unicode) */
if (decoded_chars == NULL)
goto fail;
- TextIOWrapper_set_decoded_chars(self, decoded_chars);
+ textiowrapper_set_decoded_chars(self, decoded_chars);
if (PyUnicode_GET_SIZE(decoded_chars) > 0)
eof = 0;
@@ -1467,7 +1467,7 @@
}
static PyObject *
-TextIOWrapper_read(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_read(textio *self, PyObject *args)
{
Py_ssize_t n = -1;
PyObject *result = NULL, *chunks = NULL;
@@ -1484,7 +1484,7 @@
return NULL;
}
- if (_TextIOWrapper_writeflush(self) < 0)
+ if (_textiowrapper_writeflush(self) < 0)
return NULL;
if (n < 0) {
@@ -1499,7 +1499,7 @@
if (decoded == NULL)
goto fail;
- result = TextIOWrapper_get_decoded_chars(self, -1);
+ result = textiowrapper_get_decoded_chars(self, -1);
if (result == NULL) {
Py_DECREF(decoded);
@@ -1517,14 +1517,14 @@
int res = 1;
Py_ssize_t remaining = n;
- result = TextIOWrapper_get_decoded_chars(self, n);
+ result = textiowrapper_get_decoded_chars(self, n);
if (result == NULL)
goto fail;
remaining -= PyUnicode_GET_SIZE(result);
/* Keep reading chunks until we have n characters to return */
while (remaining > 0) {
- res = TextIOWrapper_read_chunk(self);
+ res = textiowrapper_read_chunk(self);
if (res < 0)
goto fail;
if (res == 0) /* EOF */
@@ -1537,7 +1537,7 @@
if (PyList_Append(chunks, result) < 0)
goto fail;
Py_DECREF(result);
- result = TextIOWrapper_get_decoded_chars(self, remaining);
+ result = textiowrapper_get_decoded_chars(self, remaining);
if (result == NULL)
goto fail;
remaining -= PyUnicode_GET_SIZE(result);
@@ -1662,7 +1662,7 @@
}
static PyObject *
-_TextIOWrapper_readline(PyTextIOWrapperObject *self, Py_ssize_t limit)
+_textiowrapper_readline(textio *self, Py_ssize_t limit)
{
PyObject *line = NULL, *chunks = NULL, *remaining = NULL;
Py_ssize_t start, endpos, chunked, offset_to_buffer;
@@ -1670,7 +1670,7 @@
CHECK_CLOSED(self);
- if (_TextIOWrapper_writeflush(self) < 0)
+ if (_textiowrapper_writeflush(self) < 0)
return NULL;
chunked = 0;
@@ -1684,7 +1684,7 @@
res = 1;
while (!self->decoded_chars ||
!PyUnicode_GET_SIZE(self->decoded_chars)) {
- res = TextIOWrapper_read_chunk(self);
+ res = textiowrapper_read_chunk(self);
if (res < 0)
goto error;
if (res == 0)
@@ -1692,7 +1692,7 @@
}
if (res == 0) {
/* end of file */
- TextIOWrapper_set_decoded_chars(self, NULL);
+ textiowrapper_set_decoded_chars(self, NULL);
Py_CLEAR(self->snapshot);
start = endpos = offset_to_buffer = 0;
break;
@@ -1763,7 +1763,7 @@
}
Py_CLEAR(line);
/* We have consumed the buffer */
- TextIOWrapper_set_decoded_chars(self, NULL);
+ textiowrapper_set_decoded_chars(self, NULL);
}
if (line != NULL) {
@@ -1816,7 +1816,7 @@
}
static PyObject *
-TextIOWrapper_readline(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_readline(textio *self, PyObject *args)
{
Py_ssize_t limit = -1;
@@ -1824,7 +1824,7 @@
if (!PyArg_ParseTuple(args, "|n:readline", &limit)) {
return NULL;
}
- return _TextIOWrapper_readline(self, limit);
+ return _textiowrapper_readline(self, limit);
}
/* Seek and Tell */
@@ -1835,7 +1835,7 @@
int bytes_to_feed;
int chars_to_skip;
char need_eof;
-} CookieStruct;
+} cookie_type;
/*
To speed up cookie packing/unpacking, we store the fields in a temporary
@@ -1876,7 +1876,7 @@
#endif
static int
-TextIOWrapper_parseCookie(CookieStruct *cookie, PyObject *cookieObj)
+textiowrapper_parse_cookie(cookie_type *cookie, PyObject *cookieObj)
{
unsigned char buffer[COOKIE_BUF_LEN];
PyLongObject *cookieLong = (PyLongObject *)PyNumber_Long(cookieObj);
@@ -1900,7 +1900,7 @@
}
static PyObject *
-TextIOWrapper_buildCookie(CookieStruct *cookie)
+textiowrapper_build_cookie(cookie_type *cookie)
{
unsigned char buffer[COOKIE_BUF_LEN];
@@ -1915,8 +1915,7 @@
#undef IS_LITTLE_ENDIAN
static int
-_TextIOWrapper_decoder_setstate(PyTextIOWrapperObject *self,
- CookieStruct *cookie)
+_textiowrapper_decoder_setstate(textio *self, cookie_type *cookie)
{
PyObject *res;
/* When seeking to the start of the stream, we call decoder.reset()
@@ -1937,11 +1936,10 @@
}
static int
-_TextIOWrapper_encoder_setstate(PyTextIOWrapperObject *self,
- CookieStruct *cookie)
+_textiowrapper_encoder_setstate(textio *self, cookie_type *cookie)
{
PyObject *res;
- /* Same as _TextIOWrapper_decoder_setstate() above. */
+ /* Same as _textiowrapper_decoder_setstate() above. */
if (cookie->start_pos == 0 && cookie->dec_flags == 0) {
res = PyObject_CallMethodObjArgs(self->encoder, _PyIO_str_reset, NULL);
self->encoding_start_of_stream = 1;
@@ -1958,10 +1956,10 @@
}
static PyObject *
-TextIOWrapper_seek(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_seek(textio *self, PyObject *args)
{
PyObject *cookieObj, *posobj;
- CookieStruct cookie;
+ cookie_type cookie;
int whence = 0;
PyObject *res;
int cmp;
@@ -2018,7 +2016,7 @@
goto fail;
Py_DECREF(res);
- TextIOWrapper_set_decoded_chars(self, NULL);
+ textiowrapper_set_decoded_chars(self, NULL);
Py_CLEAR(self->snapshot);
if (self->decoder) {
res = PyObject_CallMethod(self->decoder, "reset", NULL);
@@ -2055,7 +2053,7 @@
/* The strategy of seek() is to go back to the safe start point
* and replay the effect of read(chars_to_skip) from there.
*/
- if (TextIOWrapper_parseCookie(&cookie, cookieObj) < 0)
+ if (textiowrapper_parse_cookie(&cookie, cookieObj) < 0)
goto fail;
/* Seek back to the safe start point. */
@@ -2069,12 +2067,12 @@
goto fail;
Py_DECREF(res);
- TextIOWrapper_set_decoded_chars(self, NULL);
+ textiowrapper_set_decoded_chars(self, NULL);
Py_CLEAR(self->snapshot);
/* Restore the decoder to its state from the safe start point. */
if (self->decoder) {
- if (_TextIOWrapper_decoder_setstate(self, &cookie) < 0)
+ if (_textiowrapper_decoder_setstate(self, &cookie) < 0)
goto fail;
}
@@ -2101,7 +2099,7 @@
if (decoded == NULL)
goto fail;
- TextIOWrapper_set_decoded_chars(self, decoded);
+ textiowrapper_set_decoded_chars(self, decoded);
/* Skip chars_to_skip of the decoded characters. */
if (PyUnicode_GetSize(self->decoded_chars) < cookie.chars_to_skip) {
@@ -2118,7 +2116,7 @@
/* Finally, reset the encoder (merely useful for proper BOM handling) */
if (self->encoder) {
- if (_TextIOWrapper_encoder_setstate(self, &cookie) < 0)
+ if (_textiowrapper_encoder_setstate(self, &cookie) < 0)
goto fail;
}
return cookieObj;
@@ -2129,11 +2127,11 @@
}
static PyObject *
-TextIOWrapper_tell(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_tell(textio *self, PyObject *args)
{
PyObject *res;
PyObject *posobj = NULL;
- CookieStruct cookie = {0,0,0,0,0};
+ cookie_type cookie = {0,0,0,0,0};
PyObject *next_input;
Py_ssize_t chars_to_skip, chars_decoded;
PyObject *saved_state = NULL;
@@ -2153,7 +2151,7 @@
goto fail;
}
- if (_TextIOWrapper_writeflush(self) < 0)
+ if (_textiowrapper_writeflush(self) < 0)
return NULL;
res = PyObject_CallMethod((PyObject *)self, "flush", NULL);
if (res == NULL)
@@ -2189,7 +2187,7 @@
if (self->decoded_chars_used == 0) {
/* We haven't moved from the snapshot point. */
Py_DECREF(posobj);
- return TextIOWrapper_buildCookie(&cookie);
+ return textiowrapper_build_cookie(&cookie);
}
chars_to_skip = self->decoded_chars_used;
@@ -2203,7 +2201,7 @@
goto fail;
/* Note our initial start point. */
- if (_TextIOWrapper_decoder_setstate(self, &cookie) < 0)
+ if (_textiowrapper_decoder_setstate(self, &cookie) < 0)
goto fail;
/* Feed the decoder one byte at a time. As we go, note the
@@ -2280,7 +2278,7 @@
/* The returned cookie corresponds to the last safe start point. */
cookie.chars_to_skip = Py_SAFE_DOWNCAST(chars_to_skip, Py_ssize_t, int);
- return TextIOWrapper_buildCookie(&cookie);
+ return textiowrapper_build_cookie(&cookie);
fail:
Py_XDECREF(posobj);
@@ -2300,7 +2298,7 @@
}
static PyObject *
-TextIOWrapper_truncate(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_truncate(textio *self, PyObject *args)
{
PyObject *pos = Py_None;
PyObject *res;
@@ -2327,7 +2325,7 @@
}
static PyObject *
-TextIOWrapper_repr(PyTextIOWrapperObject *self)
+textiowrapper_repr(textio *self)
{
PyObject *nameobj, *res;
@@ -2354,53 +2352,53 @@
/* Inquiries */
static PyObject *
-TextIOWrapper_fileno(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_fileno(textio *self, PyObject *args)
{
CHECK_INITIALIZED(self);
return PyObject_CallMethod(self->buffer, "fileno", NULL);
}
static PyObject *
-TextIOWrapper_seekable(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_seekable(textio *self, PyObject *args)
{
CHECK_INITIALIZED(self);
return PyObject_CallMethod(self->buffer, "seekable", NULL);
}
static PyObject *
-TextIOWrapper_readable(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_readable(textio *self, PyObject *args)
{
CHECK_INITIALIZED(self);
return PyObject_CallMethod(self->buffer, "readable", NULL);
}
static PyObject *
-TextIOWrapper_writable(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_writable(textio *self, PyObject *args)
{
CHECK_INITIALIZED(self);
return PyObject_CallMethod(self->buffer, "writable", NULL);
}
static PyObject *
-TextIOWrapper_isatty(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_isatty(textio *self, PyObject *args)
{
CHECK_INITIALIZED(self);
return PyObject_CallMethod(self->buffer, "isatty", NULL);
}
static PyObject *
-TextIOWrapper_flush(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_flush(textio *self, PyObject *args)
{
CHECK_INITIALIZED(self);
CHECK_CLOSED(self);
self->telling = self->seekable;
- if (_TextIOWrapper_writeflush(self) < 0)
+ if (_textiowrapper_writeflush(self) < 0)
return NULL;
return PyObject_CallMethod(self->buffer, "flush", NULL);
}
static PyObject *
-TextIOWrapper_close(PyTextIOWrapperObject *self, PyObject *args)
+textiowrapper_close(textio *self, PyObject *args)
{
PyObject *res;
CHECK_INITIALIZED(self);
@@ -2416,7 +2414,7 @@
}
static PyObject *
-TextIOWrapper_iternext(PyTextIOWrapperObject *self)
+textiowrapper_iternext(textio *self)
{
PyObject *line;
@@ -2425,7 +2423,7 @@
self->telling = 0;
if (Py_TYPE(self) == &PyTextIOWrapper_Type) {
/* Skip method call overhead for speed */
- line = _TextIOWrapper_readline(self, -1);
+ line = _textiowrapper_readline(self, -1);
}
else {
line = PyObject_CallMethodObjArgs((PyObject *)self,
@@ -2454,21 +2452,21 @@
}
static PyObject *
-TextIOWrapper_name_get(PyTextIOWrapperObject *self, void *context)
+textiowrapper_name_get(textio *self, void *context)
{
CHECK_INITIALIZED(self);
return PyObject_GetAttrString(self->buffer, "name");
}
static PyObject *
-TextIOWrapper_closed_get(PyTextIOWrapperObject *self, void *context)
+textiowrapper_closed_get(textio *self, void *context)
{
CHECK_INITIALIZED(self);
return PyObject_GetAttr(self->buffer, _PyIO_str_closed);
}
static PyObject *
-TextIOWrapper_newlines_get(PyTextIOWrapperObject *self, void *context)
+textiowrapper_newlines_get(textio *self, void *context)
{
PyObject *res;
CHECK_INITIALIZED(self);
@@ -2488,22 +2486,21 @@
}
static PyObject *
-TextIOWrapper_errors_get(PyTextIOWrapperObject *self, void *context)
+textiowrapper_errors_get(textio *self, void *context)
{
CHECK_INITIALIZED(self);
return PyUnicode_FromString(PyBytes_AS_STRING(self->errors));
}
static PyObject *
-TextIOWrapper_chunk_size_get(PyTextIOWrapperObject *self, void *context)
+textiowrapper_chunk_size_get(textio *self, void *context)
{
CHECK_INITIALIZED(self);
return PyLong_FromSsize_t(self->chunk_size);
}
static int
-TextIOWrapper_chunk_size_set(PyTextIOWrapperObject *self,
- PyObject *arg, void *context)
+textiowrapper_chunk_size_set(textio *self, PyObject *arg, void *context)
{
Py_ssize_t n;
CHECK_INITIALIZED_INT(self);
@@ -2519,56 +2516,56 @@
return 0;
}
-static PyMethodDef TextIOWrapper_methods[] = {
- {"detach", (PyCFunction)TextIOWrapper_detach, METH_NOARGS},
- {"write", (PyCFunction)TextIOWrapper_write, METH_VARARGS},
- {"read", (PyCFunction)TextIOWrapper_read, METH_VARARGS},
- {"readline", (PyCFunction)TextIOWrapper_readline, METH_VARARGS},
- {"flush", (PyCFunction)TextIOWrapper_flush, METH_NOARGS},
- {"close", (PyCFunction)TextIOWrapper_close, METH_NOARGS},
+static PyMethodDef textiowrapper_methods[] = {
+ {"detach", (PyCFunction)textiowrapper_detach, METH_NOARGS},
+ {"write", (PyCFunction)textiowrapper_write, METH_VARARGS},
+ {"read", (PyCFunction)textiowrapper_read, METH_VARARGS},
+ {"readline", (PyCFunction)textiowrapper_readline, METH_VARARGS},
+ {"flush", (PyCFunction)textiowrapper_flush, METH_NOARGS},
+ {"close", (PyCFunction)textiowrapper_close, METH_NOARGS},
- {"fileno", (PyCFunction)TextIOWrapper_fileno, METH_NOARGS},
- {"seekable", (PyCFunction)TextIOWrapper_seekable, METH_NOARGS},
- {"readable", (PyCFunction)TextIOWrapper_readable, METH_NOARGS},
- {"writable", (PyCFunction)TextIOWrapper_writable, METH_NOARGS},
- {"isatty", (PyCFunction)TextIOWrapper_isatty, METH_NOARGS},
+ {"fileno", (PyCFunction)textiowrapper_fileno, METH_NOARGS},
+ {"seekable", (PyCFunction)textiowrapper_seekable, METH_NOARGS},
+ {"readable", (PyCFunction)textiowrapper_readable, METH_NOARGS},
+ {"writable", (PyCFunction)textiowrapper_writable, METH_NOARGS},
+ {"isatty", (PyCFunction)textiowrapper_isatty, METH_NOARGS},
- {"seek", (PyCFunction)TextIOWrapper_seek, METH_VARARGS},
- {"tell", (PyCFunction)TextIOWrapper_tell, METH_NOARGS},
- {"truncate", (PyCFunction)TextIOWrapper_truncate, METH_VARARGS},
+ {"seek", (PyCFunction)textiowrapper_seek, METH_VARARGS},
+ {"tell", (PyCFunction)textiowrapper_tell, METH_NOARGS},
+ {"truncate", (PyCFunction)textiowrapper_truncate, METH_VARARGS},
{NULL, NULL}
};
-static PyMemberDef TextIOWrapper_members[] = {
- {"encoding", T_OBJECT, offsetof(PyTextIOWrapperObject, encoding), READONLY},
- {"buffer", T_OBJECT, offsetof(PyTextIOWrapperObject, buffer), READONLY},
- {"line_buffering", T_BOOL, offsetof(PyTextIOWrapperObject, line_buffering), READONLY},
+static PyMemberDef textiowrapper_members[] = {
+ {"encoding", T_OBJECT, offsetof(textio, encoding), READONLY},
+ {"buffer", T_OBJECT, offsetof(textio, buffer), READONLY},
+ {"line_buffering", T_BOOL, offsetof(textio, line_buffering), READONLY},
{NULL}
};
-static PyGetSetDef TextIOWrapper_getset[] = {
- {"name", (getter)TextIOWrapper_name_get, NULL, NULL},
- {"closed", (getter)TextIOWrapper_closed_get, NULL, NULL},
+static PyGetSetDef textiowrapper_getset[] = {
+ {"name", (getter)textiowrapper_name_get, NULL, NULL},
+ {"closed", (getter)textiowrapper_closed_get, NULL, NULL},
/* {"mode", (getter)TextIOWrapper_mode_get, NULL, NULL},
*/
- {"newlines", (getter)TextIOWrapper_newlines_get, NULL, NULL},
- {"errors", (getter)TextIOWrapper_errors_get, NULL, NULL},
- {"_CHUNK_SIZE", (getter)TextIOWrapper_chunk_size_get,
- (setter)TextIOWrapper_chunk_size_set, NULL},
+ {"newlines", (getter)textiowrapper_newlines_get, NULL, NULL},
+ {"errors", (getter)textiowrapper_errors_get, NULL, NULL},
+ {"_CHUNK_SIZE", (getter)textiowrapper_chunk_size_get,
+ (setter)textiowrapper_chunk_size_set, NULL},
{NULL}
};
PyTypeObject PyTextIOWrapper_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_io.TextIOWrapper", /*tp_name*/
- sizeof(PyTextIOWrapperObject), /*tp_basicsize*/
+ sizeof(textio), /*tp_basicsize*/
0, /*tp_itemsize*/
- (destructor)TextIOWrapper_dealloc, /*tp_dealloc*/
+ (destructor)textiowrapper_dealloc, /*tp_dealloc*/
0, /*tp_print*/
0, /*tp_getattr*/
0, /*tps_etattr*/
0, /*tp_compare */
- (reprfunc)TextIOWrapper_repr,/*tp_repr*/
+ (reprfunc)textiowrapper_repr,/*tp_repr*/
0, /*tp_as_number*/
0, /*tp_as_sequence*/
0, /*tp_as_mapping*/
@@ -2580,22 +2577,22 @@
0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE
| Py_TPFLAGS_HAVE_GC, /*tp_flags*/
- TextIOWrapper_doc, /* tp_doc */
- (traverseproc)TextIOWrapper_traverse, /* tp_traverse */
- (inquiry)TextIOWrapper_clear, /* tp_clear */
+ textiowrapper_doc, /* tp_doc */
+ (traverseproc)textiowrapper_traverse, /* tp_traverse */
+ (inquiry)textiowrapper_clear, /* tp_clear */
0, /* tp_richcompare */
- offsetof(PyTextIOWrapperObject, weakreflist), /*tp_weaklistoffset*/
+ offsetof(textio, weakreflist), /*tp_weaklistoffset*/
0, /* tp_iter */
- (iternextfunc)TextIOWrapper_iternext, /* tp_iternext */
- TextIOWrapper_methods, /* tp_methods */
- TextIOWrapper_members, /* tp_members */
- TextIOWrapper_getset, /* tp_getset */
+ (iternextfunc)textiowrapper_iternext, /* tp_iternext */
+ textiowrapper_methods, /* tp_methods */
+ textiowrapper_members, /* tp_members */
+ textiowrapper_getset, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
- offsetof(PyTextIOWrapperObject, dict), /*tp_dictoffset*/
- (initproc)TextIOWrapper_init, /* tp_init */
+ offsetof(textio, dict), /*tp_dictoffset*/
+ (initproc)textiowrapper_init, /* tp_init */
0, /* tp_alloc */
PyType_GenericNew, /* tp_new */
};