mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Move printing of filename and lineno to tb_displayline.

Browse source 
Search sys.path if the filename isn't found.
Include osdefs.h.
This commit is contained in:
Guido van Rossum 1992-02-26 15:17:59 +00:00
parent 0f61f8a4bd
commit 7169dbb76d
1 changed files with 45 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

65
Python/traceback.c
View file

@ -26,10 +26,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "allobjects.h" #include "allobjects.h"
#include "sysmodule.h"
#include "compile.h" #include "compile.h"
#include "frameobject.h" #include "frameobject.h"
#include "traceback.h" #include "traceback.h"
#include "structmember.h" #include "structmember.h"
#include "osdefs.h"
typedef struct _tracebackobject { typedef struct _tracebackobject {
OB_HEAD OB_HEAD
@ -154,21 +156,56 @@ tb_displayline(fp, filename, lineno)
int lineno; int lineno;
{ {
FILE *xfp; FILE *xfp;
char buf[1000]; char linebuf[1000];
int i; int i;
if (filename[0] == '<' && filename[strlen(filename)-1] == '>')
return;
xfp = fopen(filename, "r"); xfp = fopen(filename, "r");
if (xfp == NULL) { if (xfp == NULL) {
fprintf(fp, " (cannot open \"%s\")\n", filename); /* Search tail of filename in sys.path before giving up */
return; object *path;
char *tail = strrchr(filename, SEP);
if (tail == NULL)
tail = filename;
else
tail++;
path = sysget("path");
if (path != NULL && is_listobject(path)) {
int npath = getlistsize(path);
char namebuf[MAXPATHLEN+1];
for (i = 0; i < npath; i++) {
object *v = getlistitem(path, i);
if (is_stringobject(v)) {
int len;
strcpy(namebuf, getstringvalue(v));
len = getstringsize(v);
if (len > 0 && namebuf[len-1] != SEP)
namebuf[len++] = SEP;
strcpy(namebuf+len, tail);
xfp = fopen(namebuf, "r");
if (xfp != NULL) {
filename = namebuf;
break;
}
}
}
}
} }
fprintf(fp, " File \"%s\"", filename);
#ifdef applec /* MPW */
/* This is needed by MPW's File and Line commands */
fprintf(fp, "; ");
#else
/* This is needed by Emacs' compile command */
fprintf(fp, ", ");
#endif
fprintf(fp, "line %d\n", lineno);
if (xfp == NULL)
return;
for (i = 0; i < lineno; i++) { for (i = 0; i < lineno; i++) {
if (fgets(buf, sizeof buf, xfp) == NULL) if (fgets(linebuf, sizeof linebuf, xfp) == NULL)
break; break;
} }
if (i == lineno) { if (i == lineno) {
char *p = buf; char *p = linebuf;
while (*p == ' ' || *p == '\t') while (*p == ' ' || *p == '\t')
p++; p++;
fprintf(fp, " %s", p); fprintf(fp, " %s", p);
@ -183,19 +220,7 @@ tb_printinternal(tb, fp)
tracebackobject *tb; tracebackobject *tb;
FILE *fp; FILE *fp;
{ {
while (tb != NULL) { while (tb != NULL && !intrcheck()) {
if (intrcheck())
break;
fprintf(fp, " File \"%s\"",
getstringvalue(tb->tb_frame->f_code->co_filename));
#ifdef applec /* MPW */
/* This is needed by MPW's File and Line commands */
fprintf(fp, "; ");
#else
/* This is needed by Emacs' compile command */
fprintf(fp, ", ");
#endif
fprintf(fp, "line %d\n", tb->tb_lineno);
tb_displayline(fp, tb_displayline(fp,
getstringvalue(tb->tb_frame->f_code->co_filename), getstringvalue(tb->tb_frame->f_code->co_filename),
tb->tb_lineno); tb->tb_lineno);