mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-08 03:45:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-102832: IDLE - remove use of deprecated sys.last_xyzs for stackviewer (#103339)

Browse source
This commit is contained in:
Irit Katriel 2023-06-08 21:19:05 +01:00 • committed by GitHub
parent 68dfa49627
commit 3ee921d84f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Lib/idlelib/stackviewer.py
View file

@ -1,33 +1,30 @@
import linecache
import os
import sys
import tkinter as tk
from idlelib.debugobj import ObjectTreeItem, make_objecttreeitem
from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas
def StackBrowser(root, flist=None, tb=None, top=None):
def StackBrowser(root, exc, flist=None, top=None):
global sc, item, node # For testing.
if top is None:
top = tk.Toplevel(root)
sc = ScrolledCanvas(top, bg="white", highlightthickness=0)
sc.frame.pack(expand=1, fill="both")
item = StackTreeItem(flist, tb)
item = StackTreeItem(exc, flist)
node = TreeNode(sc.canvas, None, item)
node.expand()
class StackTreeItem(TreeItem):
def __init__(self, flist=None, tb=None):
def __init__(self, exc, flist=None):
self.flist = flist
self.stack = self.get_stack(tb)
self.text = self.get_exception()
self.stack = self.get_stack(None if exc is None else exc.__traceback__)
self.text = f"{type(exc).__name__}: {str(exc)}"
def get_stack(self, tb):
if tb is None:
tb = sys.last_traceback
stack = []
if tb and tb.tb_frame is None:
tb = tb.tb_next
@ -36,17 +33,7 @@ class StackTreeItem(TreeItem):
tb = tb.tb_next
return stack
def get_exception(self):
type = sys.last_type
value = sys.last_value
if hasattr(type, "__name__"):
type = type.__name__
s = str(type)
if value is not None:
s = s + ": " + str(value)
return s
def GetText(self):
def GetText(self): # Titlecase names are overrides.
return self.text
def GetSubList(self):
@ -133,19 +120,9 @@ def _stack_viewer(parent): # htest #
flist = PyShellFileList(top)
try: # to obtain a traceback object
intentional_name_error
except NameError:
exc_type, exc_value, exc_tb = sys.exc_info()
# inject stack trace to sys
sys.last_type = exc_type
sys.last_value = exc_value
sys.last_traceback = exc_tb
except NameError as e:
StackBrowser(top, e, flist=flist, top=top)
StackBrowser(top, flist=flist, top=top, tb=exc_tb)
# restore sys to original state
del sys.last_type
del sys.last_value
del sys.last_traceback
if __name__ == '__main__':
from unittest import main