mirror of
https://github.com/python/cpython.git
synced 2025-10-09 16:34:44 +00:00
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........
This commit is contained in:
Antoine Pitrou
parent
bd25030019
commit
f95a1b3c53
248 changed files with 113361 additions and 113361 deletions
|
|
@ -14,10 +14,10 @@
|
|||
#endif
|
||||
|
||||
/* Newline flags */
|
||||
#define NEWLINE_UNKNOWN 0 /* No newline seen, yet */
|
||||
#define NEWLINE_CR 1 /* \r newline seen */
|
||||
#define NEWLINE_LF 2 /* \n newline seen */
|
||||
#define NEWLINE_CRLF 4 /* \r\n newline seen */
|
||||
#define NEWLINE_UNKNOWN 0 /* No newline seen, yet */
|
||||
#define NEWLINE_CR 1 /* \r newline seen */
|
||||
#define NEWLINE_LF 2 /* \n newline seen */
|
||||
#define NEWLINE_CRLF 4 /* \r\n newline seen */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
@ -27,110 +27,110 @@ extern "C" {
|
|||
|
||||
PyObject *
|
||||
PyFile_FromFd(int fd, char *name, char *mode, int buffering, char *encoding,
|
||||
char *errors, char *newline, int closefd)
|
||||
char *errors, char *newline, int closefd)
|
||||
{
|
||||
PyObject *io, *stream, *nameobj = NULL;
|
||||
PyObject *io, *stream, *nameobj = NULL;
|
||||
|
||||
io = PyImport_ImportModule("io");
|
||||
if (io == NULL)
|
||||
return NULL;
|
||||
stream = PyObject_CallMethod(io, "open", "isisssi", fd, mode,
|
||||
buffering, encoding, errors,
|
||||
newline, closefd);
|
||||
Py_DECREF(io);
|
||||
if (stream == NULL)
|
||||
return NULL;
|
||||
if (name != NULL) {
|
||||
nameobj = PyUnicode_DecodeFSDefault(name);
|
||||
if (nameobj == NULL)
|
||||
PyErr_Clear();
|
||||
else {
|
||||
if (PyObject_SetAttrString(stream, "name", nameobj) < 0)
|
||||
PyErr_Clear();
|
||||
Py_DECREF(nameobj);
|
||||
}
|
||||
}
|
||||
return stream;
|
||||
io = PyImport_ImportModule("io");
|
||||
if (io == NULL)
|
||||
return NULL;
|
||||
stream = PyObject_CallMethod(io, "open", "isisssi", fd, mode,
|
||||
buffering, encoding, errors,
|
||||
newline, closefd);
|
||||
Py_DECREF(io);
|
||||
if (stream == NULL)
|
||||
return NULL;
|
||||
if (name != NULL) {
|
||||
nameobj = PyUnicode_DecodeFSDefault(name);
|
||||
if (nameobj == NULL)
|
||||
PyErr_Clear();
|
||||
else {
|
||||
if (PyObject_SetAttrString(stream, "name", nameobj) < 0)
|
||||
PyErr_Clear();
|
||||
Py_DECREF(nameobj);
|
||||
}
|
||||
}
|
||||
return stream;
|
||||
}
|
||||
|
||||
PyObject *
|
||||
PyFile_GetLine(PyObject *f, int n)
|
||||
{
|
||||
PyObject *result;
|
||||
PyObject *result;
|
||||
|
||||
if (f == NULL) {
|
||||
PyErr_BadInternalCall();
|
||||
return NULL;
|
||||
}
|
||||
if (f == NULL) {
|
||||
PyErr_BadInternalCall();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
{
|
||||
PyObject *reader;
|
||||
PyObject *args;
|
||||
{
|
||||
PyObject *reader;
|
||||
PyObject *args;
|
||||
|
||||
reader = PyObject_GetAttrString(f, "readline");
|
||||
if (reader == NULL)
|
||||
return NULL;
|
||||
if (n <= 0)
|
||||
args = PyTuple_New(0);
|
||||
else
|
||||
args = Py_BuildValue("(i)", n);
|
||||
if (args == NULL) {
|
||||
Py_DECREF(reader);
|
||||
return NULL;
|
||||
}
|
||||
result = PyEval_CallObject(reader, args);
|
||||
Py_DECREF(reader);
|
||||
Py_DECREF(args);
|
||||
if (result != NULL && !PyBytes_Check(result) &&
|
||||
!PyUnicode_Check(result)) {
|
||||
Py_DECREF(result);
|
||||
result = NULL;
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"object.readline() returned non-string");
|
||||
}
|
||||
}
|
||||
reader = PyObject_GetAttrString(f, "readline");
|
||||
if (reader == NULL)
|
||||
return NULL;
|
||||
if (n <= 0)
|
||||
args = PyTuple_New(0);
|
||||
else
|
||||
args = Py_BuildValue("(i)", n);
|
||||
if (args == NULL) {
|
||||
Py_DECREF(reader);
|
||||
return NULL;
|
||||
}
|
||||
result = PyEval_CallObject(reader, args);
|
||||
Py_DECREF(reader);
|
||||
Py_DECREF(args);
|
||||
if (result != NULL && !PyBytes_Check(result) &&
|
||||
!PyUnicode_Check(result)) {
|
||||
Py_DECREF(result);
|
||||
result = NULL;
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"object.readline() returned non-string");
|
||||
}
|
||||
}
|
||||
|
||||
if (n < 0 && result != NULL && PyBytes_Check(result)) {
|
||||
char *s = PyBytes_AS_STRING(result);
|
||||
Py_ssize_t len = PyBytes_GET_SIZE(result);
|
||||
if (len == 0) {
|
||||
Py_DECREF(result);
|
||||
result = NULL;
|
||||
PyErr_SetString(PyExc_EOFError,
|
||||
"EOF when reading a line");
|
||||
}
|
||||
else if (s[len-1] == '\n') {
|
||||
if (result->ob_refcnt == 1)
|
||||
_PyBytes_Resize(&result, len-1);
|
||||
else {
|
||||
PyObject *v;
|
||||
v = PyBytes_FromStringAndSize(s, len-1);
|
||||
Py_DECREF(result);
|
||||
result = v;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (n < 0 && result != NULL && PyUnicode_Check(result)) {
|
||||
Py_UNICODE *s = PyUnicode_AS_UNICODE(result);
|
||||
Py_ssize_t len = PyUnicode_GET_SIZE(result);
|
||||
if (len == 0) {
|
||||
Py_DECREF(result);
|
||||
result = NULL;
|
||||
PyErr_SetString(PyExc_EOFError,
|
||||
"EOF when reading a line");
|
||||
}
|
||||
else if (s[len-1] == '\n') {
|
||||
if (result->ob_refcnt == 1)
|
||||
PyUnicode_Resize(&result, len-1);
|
||||
else {
|
||||
PyObject *v;
|
||||
v = PyUnicode_FromUnicode(s, len-1);
|
||||
Py_DECREF(result);
|
||||
result = v;
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
if (n < 0 && result != NULL && PyBytes_Check(result)) {
|
||||
char *s = PyBytes_AS_STRING(result);
|
||||
Py_ssize_t len = PyBytes_GET_SIZE(result);
|
||||
if (len == 0) {
|
||||
Py_DECREF(result);
|
||||
result = NULL;
|
||||
PyErr_SetString(PyExc_EOFError,
|
||||
"EOF when reading a line");
|
||||
}
|
||||
else if (s[len-1] == '\n') {
|
||||
if (result->ob_refcnt == 1)
|
||||
_PyBytes_Resize(&result, len-1);
|
||||
else {
|
||||
PyObject *v;
|
||||
v = PyBytes_FromStringAndSize(s, len-1);
|
||||
Py_DECREF(result);
|
||||
result = v;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (n < 0 && result != NULL && PyUnicode_Check(result)) {
|
||||
Py_UNICODE *s = PyUnicode_AS_UNICODE(result);
|
||||
Py_ssize_t len = PyUnicode_GET_SIZE(result);
|
||||
if (len == 0) {
|
||||
Py_DECREF(result);
|
||||
result = NULL;
|
||||
PyErr_SetString(PyExc_EOFError,
|
||||
"EOF when reading a line");
|
||||
}
|
||||
else if (s[len-1] == '\n') {
|
||||
if (result->ob_refcnt == 1)
|
||||
PyUnicode_Resize(&result, len-1);
|
||||
else {
|
||||
PyObject *v;
|
||||
v = PyUnicode_FromUnicode(s, len-1);
|
||||
Py_DECREF(result);
|
||||
result = v;
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Interfaces to write objects/strings to file-like objects */
|
||||
|
|
@ -138,60 +138,60 @@ PyFile_GetLine(PyObject *f, int n)
|
|||
int
|
||||
PyFile_WriteObject(PyObject *v, PyObject *f, int flags)
|
||||
{
|
||||
PyObject *writer, *value, *args, *result;
|
||||
if (f == NULL) {
|
||||
PyErr_SetString(PyExc_TypeError, "writeobject with NULL file");
|
||||
return -1;
|
||||
}
|
||||
writer = PyObject_GetAttrString(f, "write");
|
||||
if (writer == NULL)
|
||||
return -1;
|
||||
if (flags & Py_PRINT_RAW) {
|
||||
value = PyObject_Str(v);
|
||||
}
|
||||
else
|
||||
value = PyObject_Repr(v);
|
||||
if (value == NULL) {
|
||||
Py_DECREF(writer);
|
||||
return -1;
|
||||
}
|
||||
args = PyTuple_Pack(1, value);
|
||||
if (args == NULL) {
|
||||
Py_DECREF(value);
|
||||
Py_DECREF(writer);
|
||||
return -1;
|
||||
}
|
||||
result = PyEval_CallObject(writer, args);
|
||||
Py_DECREF(args);
|
||||
Py_DECREF(value);
|
||||
Py_DECREF(writer);
|
||||
if (result == NULL)
|
||||
return -1;
|
||||
Py_DECREF(result);
|
||||
return 0;
|
||||
PyObject *writer, *value, *args, *result;
|
||||
if (f == NULL) {
|
||||
PyErr_SetString(PyExc_TypeError, "writeobject with NULL file");
|
||||
return -1;
|
||||
}
|
||||
writer = PyObject_GetAttrString(f, "write");
|
||||
if (writer == NULL)
|
||||
return -1;
|
||||
if (flags & Py_PRINT_RAW) {
|
||||
value = PyObject_Str(v);
|
||||
}
|
||||
else
|
||||
value = PyObject_Repr(v);
|
||||
if (value == NULL) {
|
||||
Py_DECREF(writer);
|
||||
return -1;
|
||||
}
|
||||
args = PyTuple_Pack(1, value);
|
||||
if (args == NULL) {
|
||||
Py_DECREF(value);
|
||||
Py_DECREF(writer);
|
||||
return -1;
|
||||
}
|
||||
result = PyEval_CallObject(writer, args);
|
||||
Py_DECREF(args);
|
||||
Py_DECREF(value);
|
||||
Py_DECREF(writer);
|
||||
if (result == NULL)
|
||||
return -1;
|
||||
Py_DECREF(result);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
PyFile_WriteString(const char *s, PyObject *f)
|
||||
{
|
||||
if (f == NULL) {
|
||||
/* Should be caused by a pre-existing error */
|
||||
if (!PyErr_Occurred())
|
||||
PyErr_SetString(PyExc_SystemError,
|
||||
"null file for PyFile_WriteString");
|
||||
return -1;
|
||||
}
|
||||
else if (!PyErr_Occurred()) {
|
||||
PyObject *v = PyUnicode_FromString(s);
|
||||
int err;
|
||||
if (v == NULL)
|
||||
return -1;
|
||||
err = PyFile_WriteObject(v, f, Py_PRINT_RAW);
|
||||
Py_DECREF(v);
|
||||
return err;
|
||||
}
|
||||
else
|
||||
return -1;
|
||||
if (f == NULL) {
|
||||
/* Should be caused by a pre-existing error */
|
||||
if (!PyErr_Occurred())
|
||||
PyErr_SetString(PyExc_SystemError,
|
||||
"null file for PyFile_WriteString");
|
||||
return -1;
|
||||
}
|
||||
else if (!PyErr_Occurred()) {
|
||||
PyObject *v = PyUnicode_FromString(s);
|
||||
int err;
|
||||
if (v == NULL)
|
||||
return -1;
|
||||
err = PyFile_WriteObject(v, f, Py_PRINT_RAW);
|
||||
Py_DECREF(v);
|
||||
return err;
|
||||
}
|
||||
else
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Try to get a file-descriptor from a Python object. If the object
|
||||
|
|
@ -204,45 +204,45 @@ PyFile_WriteString(const char *s, PyObject *f)
|
|||
int
|
||||
PyObject_AsFileDescriptor(PyObject *o)
|
||||
{
|
||||
int fd;
|
||||
PyObject *meth;
|
||||
int fd;
|
||||
PyObject *meth;
|
||||
|
||||
if (PyLong_Check(o)) {
|
||||
fd = PyLong_AsLong(o);
|
||||
}
|
||||
else if ((meth = PyObject_GetAttrString(o, "fileno")) != NULL)
|
||||
{
|
||||
PyObject *fno = PyEval_CallObject(meth, NULL);
|
||||
Py_DECREF(meth);
|
||||
if (fno == NULL)
|
||||
return -1;
|
||||
if (PyLong_Check(o)) {
|
||||
fd = PyLong_AsLong(o);
|
||||
}
|
||||
else if ((meth = PyObject_GetAttrString(o, "fileno")) != NULL)
|
||||
{
|
||||
PyObject *fno = PyEval_CallObject(meth, NULL);
|
||||
Py_DECREF(meth);
|
||||
if (fno == NULL)
|
||||
return -1;
|
||||
|
||||
if (PyLong_Check(fno)) {
|
||||
fd = PyLong_AsLong(fno);
|
||||
Py_DECREF(fno);
|
||||
}
|
||||
else {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"fileno() returned a non-integer");
|
||||
Py_DECREF(fno);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"argument must be an int, or have a fileno() method.");
|
||||
return -1;
|
||||
}
|
||||
if (PyLong_Check(fno)) {
|
||||
fd = PyLong_AsLong(fno);
|
||||
Py_DECREF(fno);
|
||||
}
|
||||
else {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"fileno() returned a non-integer");
|
||||
Py_DECREF(fno);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"argument must be an int, or have a fileno() method.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (fd == -1 && PyErr_Occurred())
|
||||
return -1;
|
||||
if (fd < 0) {
|
||||
PyErr_Format(PyExc_ValueError,
|
||||
"file descriptor cannot be a negative integer (%i)",
|
||||
fd);
|
||||
return -1;
|
||||
}
|
||||
return fd;
|
||||
if (fd == -1 && PyErr_Occurred())
|
||||
return -1;
|
||||
if (fd < 0) {
|
||||
PyErr_Format(PyExc_ValueError,
|
||||
"file descriptor cannot be a negative integer (%i)",
|
||||
fd);
|
||||
return -1;
|
||||
}
|
||||
return fd;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -262,68 +262,68 @@ PyObject_AsFileDescriptor(PyObject *o)
|
|||
char *
|
||||
Py_UniversalNewlineFgets(char *buf, int n, FILE *stream, PyObject *fobj)
|
||||
{
|
||||
char *p = buf;
|
||||
int c;
|
||||
int newlinetypes = 0;
|
||||
int skipnextlf = 0;
|
||||
char *p = buf;
|
||||
int c;
|
||||
int newlinetypes = 0;
|
||||
int skipnextlf = 0;
|
||||
|
||||
if (fobj) {
|
||||
errno = ENXIO; /* What can you do... */
|
||||
return NULL;
|
||||
}
|
||||
FLOCKFILE(stream);
|
||||
c = 'x'; /* Shut up gcc warning */
|
||||
while (--n > 0 && (c = GETC(stream)) != EOF ) {
|
||||
if (skipnextlf ) {
|
||||
skipnextlf = 0;
|
||||
if (c == '\n') {
|
||||
/* Seeing a \n here with skipnextlf true
|
||||
** means we saw a \r before.
|
||||
*/
|
||||
newlinetypes |= NEWLINE_CRLF;
|
||||
c = GETC(stream);
|
||||
if (c == EOF) break;
|
||||
} else {
|
||||
/*
|
||||
** Note that c == EOF also brings us here,
|
||||
** so we're okay if the last char in the file
|
||||
** is a CR.
|
||||
*/
|
||||
newlinetypes |= NEWLINE_CR;
|
||||
}
|
||||
}
|
||||
if (c == '\r') {
|
||||
/* A \r is translated into a \n, and we skip
|
||||
** an adjacent \n, if any. We don't set the
|
||||
** newlinetypes flag until we've seen the next char.
|
||||
*/
|
||||
skipnextlf = 1;
|
||||
c = '\n';
|
||||
} else if ( c == '\n') {
|
||||
newlinetypes |= NEWLINE_LF;
|
||||
}
|
||||
*p++ = c;
|
||||
if (c == '\n') break;
|
||||
}
|
||||
if ( c == EOF && skipnextlf )
|
||||
newlinetypes |= NEWLINE_CR;
|
||||
FUNLOCKFILE(stream);
|
||||
*p = '\0';
|
||||
if ( skipnextlf ) {
|
||||
/* If we have no file object we cannot save the
|
||||
** skipnextlf flag. We have to readahead, which
|
||||
** will cause a pause if we're reading from an
|
||||
** interactive stream, but that is very unlikely
|
||||
** unless we're doing something silly like
|
||||
** exec(open("/dev/tty").read()).
|
||||
*/
|
||||
c = GETC(stream);
|
||||
if ( c != '\n' )
|
||||
ungetc(c, stream);
|
||||
}
|
||||
if (p == buf)
|
||||
return NULL;
|
||||
return buf;
|
||||
if (fobj) {
|
||||
errno = ENXIO; /* What can you do... */
|
||||
return NULL;
|
||||
}
|
||||
FLOCKFILE(stream);
|
||||
c = 'x'; /* Shut up gcc warning */
|
||||
while (--n > 0 && (c = GETC(stream)) != EOF ) {
|
||||
if (skipnextlf ) {
|
||||
skipnextlf = 0;
|
||||
if (c == '\n') {
|
||||
/* Seeing a \n here with skipnextlf true
|
||||
** means we saw a \r before.
|
||||
*/
|
||||
newlinetypes |= NEWLINE_CRLF;
|
||||
c = GETC(stream);
|
||||
if (c == EOF) break;
|
||||
} else {
|
||||
/*
|
||||
** Note that c == EOF also brings us here,
|
||||
** so we're okay if the last char in the file
|
||||
** is a CR.
|
||||
*/
|
||||
newlinetypes |= NEWLINE_CR;
|
||||
}
|
||||
}
|
||||
if (c == '\r') {
|
||||
/* A \r is translated into a \n, and we skip
|
||||
** an adjacent \n, if any. We don't set the
|
||||
** newlinetypes flag until we've seen the next char.
|
||||
*/
|
||||
skipnextlf = 1;
|
||||
c = '\n';
|
||||
} else if ( c == '\n') {
|
||||
newlinetypes |= NEWLINE_LF;
|
||||
}
|
||||
*p++ = c;
|
||||
if (c == '\n') break;
|
||||
}
|
||||
if ( c == EOF && skipnextlf )
|
||||
newlinetypes |= NEWLINE_CR;
|
||||
FUNLOCKFILE(stream);
|
||||
*p = '\0';
|
||||
if ( skipnextlf ) {
|
||||
/* If we have no file object we cannot save the
|
||||
** skipnextlf flag. We have to readahead, which
|
||||
** will cause a pause if we're reading from an
|
||||
** interactive stream, but that is very unlikely
|
||||
** unless we're doing something silly like
|
||||
** exec(open("/dev/tty").read()).
|
||||
*/
|
||||
c = GETC(stream);
|
||||
if ( c != '\n' )
|
||||
ungetc(c, stream);
|
||||
}
|
||||
if (p == buf)
|
||||
return NULL;
|
||||
return buf;
|
||||
}
|
||||
|
||||
/* **************************** std printer ****************************
|
||||
|
|
@ -332,195 +332,195 @@ Py_UniversalNewlineFgets(char *buf, int n, FILE *stream, PyObject *fobj)
|
|||
*/
|
||||
|
||||
typedef struct {
|
||||
PyObject_HEAD
|
||||
int fd;
|
||||
PyObject_HEAD
|
||||
int fd;
|
||||
} PyStdPrinter_Object;
|
||||
|
||||
static PyObject *
|
||||
stdprinter_new(PyTypeObject *type, PyObject *args, PyObject *kews)
|
||||
{
|
||||
PyStdPrinter_Object *self;
|
||||
PyStdPrinter_Object *self;
|
||||
|
||||
assert(type != NULL && type->tp_alloc != NULL);
|
||||
assert(type != NULL && type->tp_alloc != NULL);
|
||||
|
||||
self = (PyStdPrinter_Object *) type->tp_alloc(type, 0);
|
||||
if (self != NULL) {
|
||||
self->fd = -1;
|
||||
}
|
||||
self = (PyStdPrinter_Object *) type->tp_alloc(type, 0);
|
||||
if (self != NULL) {
|
||||
self->fd = -1;
|
||||
}
|
||||
|
||||
return (PyObject *) self;
|
||||
return (PyObject *) self;
|
||||
}
|
||||
|
||||
static int
|
||||
fileio_init(PyObject *self, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"cannot create 'stderrprinter' instances");
|
||||
return -1;
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"cannot create 'stderrprinter' instances");
|
||||
return -1;
|
||||
}
|
||||
|
||||
PyObject *
|
||||
PyFile_NewStdPrinter(int fd)
|
||||
{
|
||||
PyStdPrinter_Object *self;
|
||||
PyStdPrinter_Object *self;
|
||||
|
||||
if (fd != fileno(stdout) && fd != fileno(stderr)) {
|
||||
/* not enough infrastructure for PyErr_BadInternalCall() */
|
||||
return NULL;
|
||||
}
|
||||
if (fd != fileno(stdout) && fd != fileno(stderr)) {
|
||||
/* not enough infrastructure for PyErr_BadInternalCall() */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
self = PyObject_New(PyStdPrinter_Object,
|
||||
&PyStdPrinter_Type);
|
||||
if (self != NULL) {
|
||||
self->fd = fd;
|
||||
}
|
||||
return (PyObject*)self;
|
||||
self = PyObject_New(PyStdPrinter_Object,
|
||||
&PyStdPrinter_Type);
|
||||
if (self != NULL) {
|
||||
self->fd = fd;
|
||||
}
|
||||
return (PyObject*)self;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
stdprinter_write(PyStdPrinter_Object *self, PyObject *args)
|
||||
{
|
||||
char *c;
|
||||
Py_ssize_t n;
|
||||
char *c;
|
||||
Py_ssize_t n;
|
||||
|
||||
if (self->fd < 0) {
|
||||
/* fd might be invalid on Windows
|
||||
* I can't raise an exception here. It may lead to an
|
||||
* unlimited recursion in the case stderr is invalid.
|
||||
*/
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
if (self->fd < 0) {
|
||||
/* fd might be invalid on Windows
|
||||
* I can't raise an exception here. It may lead to an
|
||||
* unlimited recursion in the case stderr is invalid.
|
||||
*/
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
if (!PyArg_ParseTuple(args, "s", &c)) {
|
||||
return NULL;
|
||||
}
|
||||
n = strlen(c);
|
||||
if (!PyArg_ParseTuple(args, "s", &c)) {
|
||||
return NULL;
|
||||
}
|
||||
n = strlen(c);
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
errno = 0;
|
||||
n = write(self->fd, c, n);
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
errno = 0;
|
||||
n = write(self->fd, c, n);
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
if (n < 0) {
|
||||
if (errno == EAGAIN)
|
||||
Py_RETURN_NONE;
|
||||
PyErr_SetFromErrno(PyExc_IOError);
|
||||
return NULL;
|
||||
}
|
||||
if (n < 0) {
|
||||
if (errno == EAGAIN)
|
||||
Py_RETURN_NONE;
|
||||
PyErr_SetFromErrno(PyExc_IOError);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return PyLong_FromSsize_t(n);
|
||||
return PyLong_FromSsize_t(n);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
stdprinter_fileno(PyStdPrinter_Object *self)
|
||||
{
|
||||
return PyLong_FromLong((long) self->fd);
|
||||
return PyLong_FromLong((long) self->fd);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
stdprinter_repr(PyStdPrinter_Object *self)
|
||||
{
|
||||
return PyUnicode_FromFormat("<stdprinter(fd=%d) object at 0x%x>",
|
||||
self->fd, self);
|
||||
return PyUnicode_FromFormat("<stdprinter(fd=%d) object at 0x%x>",
|
||||
self->fd, self);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
stdprinter_noop(PyStdPrinter_Object *self)
|
||||
{
|
||||
Py_RETURN_NONE;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
stdprinter_isatty(PyStdPrinter_Object *self)
|
||||
{
|
||||
long res;
|
||||
if (self->fd < 0) {
|
||||
Py_RETURN_FALSE;
|
||||
}
|
||||
long res;
|
||||
if (self->fd < 0) {
|
||||
Py_RETURN_FALSE;
|
||||
}
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
res = isatty(self->fd);
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
res = isatty(self->fd);
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
return PyBool_FromLong(res);
|
||||
return PyBool_FromLong(res);
|
||||
}
|
||||
|
||||
static PyMethodDef stdprinter_methods[] = {
|
||||
{"close", (PyCFunction)stdprinter_noop, METH_NOARGS, ""},
|
||||
{"flush", (PyCFunction)stdprinter_noop, METH_NOARGS, ""},
|
||||
{"fileno", (PyCFunction)stdprinter_fileno, METH_NOARGS, ""},
|
||||
{"isatty", (PyCFunction)stdprinter_isatty, METH_NOARGS, ""},
|
||||
{"write", (PyCFunction)stdprinter_write, METH_VARARGS, ""},
|
||||
{NULL, NULL} /*sentinel */
|
||||
{"close", (PyCFunction)stdprinter_noop, METH_NOARGS, ""},
|
||||
{"flush", (PyCFunction)stdprinter_noop, METH_NOARGS, ""},
|
||||
{"fileno", (PyCFunction)stdprinter_fileno, METH_NOARGS, ""},
|
||||
{"isatty", (PyCFunction)stdprinter_isatty, METH_NOARGS, ""},
|
||||
{"write", (PyCFunction)stdprinter_write, METH_VARARGS, ""},
|
||||
{NULL, NULL} /*sentinel */
|
||||
};
|
||||
|
||||
static PyObject *
|
||||
get_closed(PyStdPrinter_Object *self, void *closure)
|
||||
{
|
||||
Py_INCREF(Py_False);
|
||||
return Py_False;
|
||||
Py_INCREF(Py_False);
|
||||
return Py_False;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
get_mode(PyStdPrinter_Object *self, void *closure)
|
||||
{
|
||||
return PyUnicode_FromString("w");
|
||||
return PyUnicode_FromString("w");
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
get_encoding(PyStdPrinter_Object *self, void *closure)
|
||||
{
|
||||
Py_RETURN_NONE;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyGetSetDef stdprinter_getsetlist[] = {
|
||||
{"closed", (getter)get_closed, NULL, "True if the file is closed"},
|
||||
{"encoding", (getter)get_encoding, NULL, "Encoding of the file"},
|
||||
{"mode", (getter)get_mode, NULL, "String giving the file mode"},
|
||||
{0},
|
||||
{"closed", (getter)get_closed, NULL, "True if the file is closed"},
|
||||
{"encoding", (getter)get_encoding, NULL, "Encoding of the file"},
|
||||
{"mode", (getter)get_mode, NULL, "String giving the file mode"},
|
||||
{0},
|
||||
};
|
||||
|
||||
PyTypeObject PyStdPrinter_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"stderrprinter", /* tp_name */
|
||||
sizeof(PyStdPrinter_Object), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
/* methods */
|
||||
0, /* tp_dealloc */
|
||||
0, /* tp_print */
|
||||
0, /* tp_getattr */
|
||||
0, /* tp_setattr */
|
||||
0, /* tp_reserved */
|
||||
(reprfunc)stdprinter_repr, /* tp_repr */
|
||||
0, /* tp_as_number */
|
||||
0, /* tp_as_sequence */
|
||||
0, /* tp_as_mapping */
|
||||
0, /* tp_hash */
|
||||
0, /* tp_call */
|
||||
0, /* tp_str */
|
||||
PyObject_GenericGetAttr, /* tp_getattro */
|
||||
0, /* tp_setattro */
|
||||
0, /* tp_as_buffer */
|
||||
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
||||
0, /* tp_doc */
|
||||
0, /* tp_traverse */
|
||||
0, /* tp_clear */
|
||||
0, /* tp_richcompare */
|
||||
0, /* tp_weaklistoffset */
|
||||
0, /* tp_iter */
|
||||
0, /* tp_iternext */
|
||||
stdprinter_methods, /* tp_methods */
|
||||
0, /* tp_members */
|
||||
stdprinter_getsetlist, /* tp_getset */
|
||||
0, /* tp_base */
|
||||
0, /* tp_dict */
|
||||
0, /* tp_descr_get */
|
||||
0, /* tp_descr_set */
|
||||
0, /* tp_dictoffset */
|
||||
fileio_init, /* tp_init */
|
||||
PyType_GenericAlloc, /* tp_alloc */
|
||||
stdprinter_new, /* tp_new */
|
||||
PyObject_Del, /* tp_free */
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"stderrprinter", /* tp_name */
|
||||
sizeof(PyStdPrinter_Object), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
/* methods */
|
||||
0, /* tp_dealloc */
|
||||
0, /* tp_print */
|
||||
0, /* tp_getattr */
|
||||
0, /* tp_setattr */
|
||||
0, /* tp_reserved */
|
||||
(reprfunc)stdprinter_repr, /* tp_repr */
|
||||
0, /* tp_as_number */
|
||||
0, /* tp_as_sequence */
|
||||
0, /* tp_as_mapping */
|
||||
0, /* tp_hash */
|
||||
0, /* tp_call */
|
||||
0, /* tp_str */
|
||||
PyObject_GenericGetAttr, /* tp_getattro */
|
||||
0, /* tp_setattro */
|
||||
0, /* tp_as_buffer */
|
||||
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
||||
0, /* tp_doc */
|
||||
0, /* tp_traverse */
|
||||
0, /* tp_clear */
|
||||
0, /* tp_richcompare */
|
||||
0, /* tp_weaklistoffset */
|
||||
0, /* tp_iter */
|
||||
0, /* tp_iternext */
|
||||
stdprinter_methods, /* tp_methods */
|
||||
0, /* tp_members */
|
||||
stdprinter_getsetlist, /* tp_getset */
|
||||
0, /* tp_base */
|
||||
0, /* tp_dict */
|
||||
0, /* tp_descr_get */
|
||||
0, /* tp_descr_set */
|
||||
0, /* tp_dictoffset */
|
||||
fileio_init, /* tp_init */
|
||||
PyType_GenericAlloc, /* tp_alloc */
|
||||
stdprinter_new, /* tp_new */
|
||||
PyObject_Del, /* tp_free */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue