From 3e6020c4ddf7acea91efdae770320c6ce06b93db Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Fri, 24 Aug 2018 10:44:47 -0400 Subject: [PATCH] bpo-6700: Fix inspect.getsourcelines for module level frames/tracebacks (GH-8864) (cherry picked from commit 91cb298f811961277fd4cc4a32211899d48bedcb) Co-authored-by: Vladimir Matveev --- Lib/inspect.py | 7 ++++++- Lib/test/inspect_fodder.py | 6 ++++++ Lib/test/test_inspect.py | 14 ++++++++++++-- .../2018-08-22-17-43-52.bpo-6700.hp7C4B.rst | 2 ++ 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2018-08-22-17-43-52.bpo-6700.hp7C4B.rst diff --git a/Lib/inspect.py b/Lib/inspect.py index 288bfbbf76bf..4482b8ea29d5 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -954,7 +954,12 @@ def getsourcelines(object): object = unwrap(object) lines, lnum = findsource(object) - if ismodule(object): + if istraceback(object): + object = object.tb_frame + + # for module or frame that corresponds to module, return all source lines + if (ismodule(object) or + (isframe(object) and object.f_code.co_name == "")): return lines, 0 else: return getblock(lines[lnum:]), lnum + 1 diff --git a/Lib/test/inspect_fodder.py b/Lib/test/inspect_fodder.py index 711badad8492..ff3f0e4b73b9 100644 --- a/Lib/test/inspect_fodder.py +++ b/Lib/test/inspect_fodder.py @@ -74,3 +74,9 @@ class FesteringGob(MalodorousPervert, ParrotDroppings): async def lobbest(grenade): pass + +currentframe = inspect.currentframe() +try: + raise Exception() +except: + tb = sys.exc_info()[2] diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 8b701614962b..ee5a2d4c158d 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -344,7 +344,7 @@ class GetSourceBase(unittest.TestCase): def sourcerange(self, top, bottom): lines = self.source.split("\n") - return "\n".join(lines[top-1:bottom]) + "\n" + return "\n".join(lines[top-1:bottom]) + ("\n" if bottom else "") def assertSourceEqual(self, obj, top, bottom): self.assertEqual(inspect.getsource(obj), @@ -527,6 +527,16 @@ class TestRetrievingSourceCode(GetSourceBase): def test_getsource_on_code_object(self): self.assertSourceEqual(mod.eggs.__code__, 12, 18) +class TestGettingSourceOfToplevelFrames(GetSourceBase): + fodderModule = mod + + def test_range_toplevel_frame(self): + self.maxDiff = None + self.assertSourceEqual(mod.currentframe, 1, None) + + def test_range_traceback_toplevel_frame(self): + self.assertSourceEqual(mod.tb, 1, None) + class TestDecorators(GetSourceBase): fodderModule = mod2 @@ -3815,7 +3825,7 @@ def test_main(): TestBoundArguments, TestSignaturePrivateHelpers, TestSignatureDefinitions, TestGetClosureVars, TestUnwrap, TestMain, TestReload, - TestGetCoroutineState + TestGetCoroutineState, TestGettingSourceOfToplevelFrames ) if __name__ == "__main__": diff --git a/Misc/NEWS.d/next/Library/2018-08-22-17-43-52.bpo-6700.hp7C4B.rst b/Misc/NEWS.d/next/Library/2018-08-22-17-43-52.bpo-6700.hp7C4B.rst new file mode 100644 index 000000000000..d95c737a2860 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-08-22-17-43-52.bpo-6700.hp7C4B.rst @@ -0,0 +1,2 @@ +Fix inspect.getsourcelines for module level frames/tracebacks. +Patch by Vladimir Matveev. -- 2.47.3