diff options
| author | Antoine Pitrou <pitrou@free.fr> | 2017-12-31 21:35:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-31 21:35:22 (GMT) |
| commit | 14709144b521b9916f798a43aac9dc44fd44f6ca (patch) | |
| tree | da50e07a148af33b449d614687af504a09b45a9e | |
| parent | 0a37a30037073a4a9ba45e560c8445048e5f2ba2 (diff) | |
| download | cpython-14709144b521b9916f798a43aac9dc44fd44f6ca.zip cpython-14709144b521b9916f798a43aac9dc44fd44f6ca.tar.gz cpython-14709144b521b9916f798a43aac9dc44fd44f6ca.tar.bz2 | |
bpo-32468: Better frame repr() (#5067)
bpo-32468: Better frame repr()
| -rw-r--r-- | Lib/test/test_frame.py | 41 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2017-12-31-20-32-58.bpo-32468.YBs__0.rst | 1 | ||||
| -rw-r--r-- | Objects/frameobject.c | 11 |
3 files changed, 52 insertions, 1 deletions
diff --git a/Lib/test/test_frame.py b/Lib/test/test_frame.py index cabfef2..fd79508 100644 --- a/Lib/test/test_frame.py +++ b/Lib/test/test_frame.py @@ -1,3 +1,4 @@ +import re import types import unittest import weakref @@ -159,5 +160,45 @@ class FrameLocalsTest(unittest.TestCase): self.assertEqual(inner.f_locals, {}) +class ReprTest(unittest.TestCase): + """ + Tests for repr(frame). + """ + + def test_repr(self): + def outer(): + x = 5 + y = 6 + def inner(): + z = x + 2 + 1/0 + t = 9 + return inner() + + offset = outer.__code__.co_firstlineno + try: + outer() + except ZeroDivisionError as e: + tb = e.__traceback__ + frames = [] + while tb: + frames.append(tb.tb_frame) + tb = tb.tb_next + else: + self.fail("should have raised") + + f_this, f_outer, f_inner = frames + file_repr = re.escape(repr(__file__)) + self.assertRegex(repr(f_this), + r"^<frame at 0x[0-9a-fA-F]+, file %s, line %d, code test_repr>$" + % (file_repr, offset + 23)) + self.assertRegex(repr(f_outer), + r"^<frame at 0x[0-9a-fA-F]+, file %s, line %d, code outer>$" + % (file_repr, offset + 7)) + self.assertRegex(repr(f_inner), + r"^<frame at 0x[0-9a-fA-F]+, file %s, line %d, code inner>$" + % (file_repr, offset + 5)) + + if __name__ == "__main__": unittest.main() diff --git a/Misc/NEWS.d/next/Library/2017-12-31-20-32-58.bpo-32468.YBs__0.rst b/Misc/NEWS.d/next/Library/2017-12-31-20-32-58.bpo-32468.YBs__0.rst new file mode 100644 index 0000000..135bbd8 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-12-31-20-32-58.bpo-32468.YBs__0.rst @@ -0,0 +1 @@ +Improve frame repr() to mention filename, code name and current line number. diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 6ab3a22..1ac3d75 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -547,6 +547,15 @@ frame_sizeof(PyFrameObject *f) PyDoc_STRVAR(sizeof__doc__, "F.__sizeof__() -> size of F in memory, in bytes"); +static PyObject * +frame_repr(PyFrameObject *f) +{ + int lineno = PyFrame_GetLineNumber(f); + return PyUnicode_FromFormat( + "<frame at %p, file %R, line %d, code %S>", + f, f->f_code->co_filename, lineno, f->f_code->co_name); +} + static PyMethodDef frame_methods[] = { {"clear", (PyCFunction)frame_clear, METH_NOARGS, clear__doc__}, @@ -565,7 +574,7 @@ PyTypeObject PyFrame_Type = { 0, /* tp_getattr */ 0, /* tp_setattr */ 0, /* tp_reserved */ - 0, /* tp_repr */ + (reprfunc)frame_repr, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ |