summaryrefslogtreecommitdiff
path: root/Lib/test
diff options
context:
space:
mode:
authorVladimir Matveev <v2matveev@outlook.com>2018-08-24 07:18:00 -0700
committerTal Einat <taleinat+github@gmail.com>2018-08-24 17:18:00 +0300
commit91cb298f811961277fd4cc4a32211899d48bedcb (patch)
tree6b833e01b19fdae681b767cc44f4b8d3e676e88a /Lib/test
parent075b3c325913475be16650f7cb2a99f3136623b9 (diff)
downloadcpython-git-91cb298f811961277fd4cc4a32211899d48bedcb.tar.gz
bpo-6700: Fix inspect.getsourcelines for module level frames/tracebacks (GH-8864)
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/inspect_fodder.py6
-rw-r--r--Lib/test/test_inspect.py14
2 files changed, 18 insertions, 2 deletions
diff --git a/Lib/test/inspect_fodder.py b/Lib/test/inspect_fodder.py
index 711badad84..ff3f0e4b73 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 cda8d5cf73..e523dd4063 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
@@ -3870,7 +3880,7 @@ def test_main():
TestBoundArguments, TestSignaturePrivateHelpers,
TestSignatureDefinitions, TestIsDataDescriptor,
TestGetClosureVars, TestUnwrap, TestMain, TestReload,
- TestGetCoroutineState
+ TestGetCoroutineState, TestGettingSourceOfToplevelFrames
)
if __name__ == "__main__":