mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 19:34:08 +00:00 
			
		
		
		
	Merge with 3.4
This commit is contained in:
		
						commit
						f5e0c41d6d
					
				
					 1 changed files with 2 additions and 6 deletions
				
			
		| 
						 | 
					@ -10,8 +10,7 @@ from idlelib.PyShell import PyShellFileList
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def StackBrowser(root, flist=None, tb=None, top=None):
 | 
					def StackBrowser(root, flist=None, tb=None, top=None):
 | 
				
			||||||
    if top is None:
 | 
					    if top is None:
 | 
				
			||||||
        from tkinter import Toplevel
 | 
					        top = tk.Toplevel(root)
 | 
				
			||||||
        top = Toplevel(root)
 | 
					 | 
				
			||||||
    sc = ScrolledCanvas(top, bg="white", highlightthickness=0)
 | 
					    sc = ScrolledCanvas(top, bg="white", highlightthickness=0)
 | 
				
			||||||
    sc.frame.pack(expand=1, fill="both")
 | 
					    sc.frame.pack(expand=1, fill="both")
 | 
				
			||||||
    item = StackTreeItem(flist, tb)
 | 
					    item = StackTreeItem(flist, tb)
 | 
				
			||||||
| 
						 | 
					@ -108,12 +107,9 @@ class VariablesTreeItem(ObjectTreeItem):
 | 
				
			||||||
    def IsExpandable(self):
 | 
					    def IsExpandable(self):
 | 
				
			||||||
        return len(self.object) > 0
 | 
					        return len(self.object) > 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def keys(self):
 | 
					 | 
				
			||||||
        return list(self.object.keys())
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    def GetSubList(self):
 | 
					    def GetSubList(self):
 | 
				
			||||||
        sublist = []
 | 
					        sublist = []
 | 
				
			||||||
        for key in self.keys():
 | 
					        for key in self.object.keys():
 | 
				
			||||||
            try:
 | 
					            try:
 | 
				
			||||||
                value = self.object[key]
 | 
					                value = self.object[key]
 | 
				
			||||||
            except KeyError:
 | 
					            except KeyError:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue