summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Serwy <roger.serwy@gmail.com>2013-04-09 01:59:11 (GMT)
committerRoger Serwy <roger.serwy@gmail.com>2013-04-09 01:59:11 (GMT)
commitcb31d1fe1b55013b8cb60338fd75a5c8511d2cc1 (patch)
tree306a20438045f53777ebb90aed1ca9c94d2cff88
parentcd777eaf53e438e2c3b7aab384f18d56b262bc0b (diff)
parent0803a3956165ac8d80824367b97564f1ced427c8 (diff)
downloadcpython-cb31d1fe1b55013b8cb60338fd75a5c8511d2cc1.zip
cpython-cb31d1fe1b55013b8cb60338fd75a5c8511d2cc1.tar.gz
cpython-cb31d1fe1b55013b8cb60338fd75a5c8511d2cc1.tar.bz2
#17657: merge with 3.3.
-rw-r--r--Lib/idlelib/aboutDialog.py7
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 6 deletions
diff --git a/Lib/idlelib/aboutDialog.py b/Lib/idlelib/aboutDialog.py
index cfccc0f..7fe1ab8 100644
--- a/Lib/idlelib/aboutDialog.py
+++ b/Lib/idlelib/aboutDialog.py
@@ -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)
diff --git a/Misc/NEWS b/Misc/NEWS
index 203d5cd..9569daf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.