mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 04:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

PyFile_WriteString now returns an error indicator instead of calling

Browse source 
PyErr_Clear().  Add checking of those errors.
This commit is contained in:
Guido van Rossum 1997-05-22 22:35:47 +00:00
parent 78a1ed3d70
commit 7e8d26d78c
2 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/marshal.c
View file

@ -354,11 +354,11 @@ r_long64(p)
#else #else
if (r_long(p) != 0) { if (r_long(p) != 0) {
PyObject *f = PySys_GetObject("stderr"); PyObject *f = PySys_GetObject("stderr");
PyErr_Clear();
if (f != NULL) if (f != NULL)
PyFile_WriteString( (void) PyFile_WriteString(
"Warning: un-marshal 64-bit int in 32-bit mode\n", "Warning: un-marshal 64-bit int in 32-bit mode\n",
f); f);
PyErr_Clear();
} }
#endif #endif
return x; return x;

44
Python/traceback.c
View file

@ -132,16 +132,19 @@ PyTraceBack_Here(frame)
return 0; return 0;
} }
static void static int
tb_displayline(f, filename, lineno, name) tb_displayline(f, filename, lineno, name)
PyObject *f; PyObject *f;
char *filename; char *filename;
int lineno; int lineno;
char *name; char *name;
{ {
int err = 0;
FILE *xfp; FILE *xfp;
char linebuf[1000]; char linebuf[1000];
int i; int i;
if (filename == NULL || name == NULL)
return -1;
#ifdef MPW #ifdef MPW
/* This is needed by MPW's File and Line commands */ /* This is needed by MPW's File and Line commands */
#define FMT " File \"%.900s\"; line %d # in %s\n" #define FMT " File \"%.900s\"; line %d # in %s\n"
@ -165,6 +168,10 @@ tb_displayline(f, filename, lineno, name)
char namebuf[MAXPATHLEN+1]; char namebuf[MAXPATHLEN+1];
for (i = 0; i < npath; i++) { for (i = 0; i < npath; i++) {
PyObject *v = PyList_GetItem(path, i); PyObject *v = PyList_GetItem(path, i);
if (v == NULL) {
PyErr_Clear();
break;
}
if (PyString_Check(v)) { if (PyString_Check(v)) {
int len; int len;
len = PyString_Size(v); len = PyString_Size(v);
@ -186,9 +193,9 @@ tb_displayline(f, filename, lineno, name)
} }
} }
sprintf(linebuf, FMT, filename, lineno, name); sprintf(linebuf, FMT, filename, lineno, name);
PyFile_WriteString(linebuf, f); err = PyFile_WriteString(linebuf, f);
if (xfp == NULL) if (xfp == NULL || err != 0)
return; return err;
for (i = 0; i < lineno; i++) { for (i = 0; i < lineno; i++) {
if (fgets(linebuf, sizeof linebuf, xfp) == NULL) if (fgets(linebuf, sizeof linebuf, xfp) == NULL)
break; break;
@ -197,32 +204,36 @@ tb_displayline(f, filename, lineno, name)
char *p = linebuf; char *p = linebuf;
while (*p == ' ' || *p == '\t' || *p == '\014') while (*p == ' ' || *p == '\t' || *p == '\014')
p++; p++;
PyFile_WriteString(" ", f); err = PyFile_WriteString(" ", f);
PyFile_WriteString(p, f); if (err == 0) {
if (strchr(p, '\n') == NULL) err = PyFile_WriteString(p, f);
PyFile_WriteString("\n", f); if (err == 0 && strchr(p, '\n') == NULL)
err = PyFile_WriteString("\n", f);
}
} }
fclose(xfp); fclose(xfp);
return err;
} }
static void static int
tb_printinternal(tb, f, limit) tb_printinternal(tb, f, limit)
tracebackobject *tb; tracebackobject *tb;
PyObject *f; PyObject *f;
int limit; int limit;
{ {
int err = 0;
int depth = 0; int depth = 0;
tracebackobject *tb1 = tb; tracebackobject *tb1 = tb;
while (tb1 != NULL) { while (tb1 != NULL) {
depth++; depth++;
tb1 = tb1->tb_next; tb1 = tb1->tb_next;
} }
while (tb != NULL && !PyOS_InterruptOccurred()) { while (tb != NULL && err == 0) {
if (depth <= limit) { if (depth <= limit) {
if (Py_OptimizeFlag) if (Py_OptimizeFlag)
tb->tb_lineno = PyCode_Addr2Line( tb->tb_lineno = PyCode_Addr2Line(
tb->tb_frame->f_code, tb->tb_lasti); tb->tb_frame->f_code, tb->tb_lasti);
tb_displayline(f, err = tb_displayline(f,
PyString_AsString( PyString_AsString(
tb->tb_frame->f_code->co_filename), tb->tb_frame->f_code->co_filename),
tb->tb_lineno, tb->tb_lineno,
@ -230,7 +241,10 @@ tb_printinternal(tb, f, limit)
} }
depth--; depth--;
tb = tb->tb_next; tb = tb->tb_next;
if (err == 0)
err = PyErr_CheckSignals();
} }
return err;
} }
int int
@ -238,6 +252,7 @@ PyTraceBack_Print(v, f)
PyObject *v; PyObject *v;
PyObject *f; PyObject *f;
{ {
int err;
PyObject *limitv; PyObject *limitv;
int limit = 1000; int limit = 1000;
if (v == NULL) if (v == NULL)
@ -252,7 +267,8 @@ PyTraceBack_Print(v, f)
if (limit <= 0) if (limit <= 0)
return 0; return 0;
} }
PyFile_WriteString("Traceback (innermost last):\n", f); err = PyFile_WriteString("Traceback (innermost last):\n", f);
tb_printinternal((tracebackobject *)v, f, limit); if (!err)
return 0; err = tb_printinternal((tracebackobject *)v, f, limit);
return err;
} }