#17657: merge with 3.3.

This commit is contained in:
Roger Serwy 2013-04-08 20:59:11 -05:00
commit cb31d1fe1b
2 changed files with 4 additions and 6 deletions

View File

@ -66,12 +66,7 @@ class AboutDialog(Toplevel):
labelPythonVer = Label(frameBg, text='Python version: ' + \
sys.version.split()[0], fg=self.fg, bg=self.bg)
labelPythonVer.grid(row=9, column=0, sticky=W, padx=10, pady=0)
# handle weird tk version num in windoze python >= 1.6 (?!?)
tkVer = repr(TkVersion).split('.')
tkVer[len(tkVer)-1] = str('%.3g' % (float('.'+tkVer[len(tkVer)-1])))[2:]
if tkVer[len(tkVer)-1] == '':
tkVer[len(tkVer)-1] = '0'
tkVer = '.'.join(tkVer)
tkVer = self.tk.call('info', 'patchlevel')
labelTkVer = Label(frameBg, text='Tk version: '+
tkVer, fg=self.fg, bg=self.bg)
labelTkVer.grid(row=9, column=1, sticky=W, padx=2, pady=0)

View File

@ -1028,6 +1028,9 @@ _ Issue #17385: Fix quadratic behavior in threading.Condition. The FIFO
IDLE
----
- Issue #17657: Show full Tk version in IDLE's about dialog.
Patch by Todd Rovito.
- Issue #17613: Prevent traceback when removing syntax colorizer in IDLE.
- Issue #1207589: Backwards-compatibility patch for right-click menu in IDLE.