diff options
| author | Kristjan Valur Jonsson <sweskman@gmail.com> | 2011-03-30 11:24:58 +0000 |
|---|---|---|
| committer | Kristjan Valur Jonsson <sweskman@gmail.com> | 2011-03-30 11:24:58 +0000 |
| commit | c1b1930e7591b395dee499765ec40dfb946b019c (patch) | |
| tree | b4c52b0c46bc31544d6ad32ed7ff1bb501e60d80 /Python/traceback.c | |
| parent | 6e5ebc654984fbc7db6148197a89d0e7d4cf435c (diff) | |
| parent | 2bb0258a88cb339cafb87163c7194484dff0efd9 (diff) | |
| download | cpython-c1b1930e7591b395dee499765ec40dfb946b019c.tar.gz | |
Merge 3.1
Diffstat (limited to 'Python/traceback.c')
| -rw-r--r-- | Python/traceback.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Python/traceback.c b/Python/traceback.c index 2f1c213fa3..59bb3f0d15 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -7,7 +7,6 @@ #include "frameobject.h" #include "structmember.h" #include "osdefs.h" -#include "traceback.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif @@ -114,8 +113,7 @@ newtracebackobject(PyTracebackObject *next, PyFrameObject *frame) Py_XINCREF(frame); tb->tb_frame = frame; tb->tb_lasti = frame->f_lasti; - tb->tb_lineno = PyCode_Addr2Line(frame->f_code, - frame->f_lasti); + tb->tb_lineno = PyFrame_GetLineNumber(frame); PyObject_GC_Track(tb); } return tb; @@ -150,8 +148,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject * Py_ssize_t len; PyObject* result; - filebytes = PyUnicode_AsEncodedObject(filename, - Py_FileSystemDefaultEncoding, "surrogateescape"); + filebytes = PyUnicode_EncodeFSDefault(filename); if (filebytes == NULL) { PyErr_Clear(); return NULL; @@ -179,9 +176,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject * } if (!PyUnicode_Check(v)) continue; - - path = PyUnicode_AsEncodedObject(v, Py_FileSystemDefaultEncoding, - "surrogateescape"); + path = PyUnicode_EncodeFSDefault(v); if (path == NULL) { PyErr_Clear(); continue; |