mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 10:16:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 79576-79578 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79576 | florent.xicluna | 2010-04-02 10:24:52 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: Fix additional "-3" warnings in the idlelib package, and convert to absolute imports.
........
  r79577 | florent.xicluna | 2010-04-02 11:15:26 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: Drop the cmp argument.
........
  r79578 | florent.xicluna | 2010-04-02 11:30:21 +0300 (Fri, 02 Apr 2010) | 2 lines

  #7092: silence some py3k warnings
........
This commit is contained in:
Ezio Melotti 2010-08-02 20:40:20 +00:00
parent b55d368055
commit 4c6daf1037
37 changed files with 173 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/idlelib/TreeWidget.py
View file

@ -18,8 +18,8 @@ import os
from Tkinter import *
import imp
import ZoomHeight
from configHandler import idleConf
from idlelib import ZoomHeight
from idlelib.configHandler import idleConf
ICONDIR = "Icons"
@ -397,7 +397,7 @@ class FileTreeItem(TreeItem):
names = os.listdir(self.path)
except os.error:
return []
names.sort(lambda a, b: cmp(os.path.normcase(a), os.path.normcase(b)))
names.sort(key = os.path.normcase)
sublist = []
for name in names:
item = FileTreeItem(os.path.join(self.path, name))
@ -452,7 +452,7 @@ class ScrolledCanvas:
# Testing functions
def test():
import PyShell
from idlelib import PyShell
root = Toplevel(PyShell.root)
root.configure(bd=0, bg="yellow")
root.focus_set()