[Python-checkins] cpython (merge 3.3 -> default): #17657: merge with 3.3.

roger.serwy python-checkins at python.org
Tue Apr 9 04:00:24 CEST 2013


http://hg.python.org/cpython/rev/50164abbfc98
changeset:   83207:50164abbfc98
parent:      83204:d3185be3e8d7
parent:      83206:769699f0a760
user:        Roger Serwy <roger.serwy at gmail.com>
date:        Mon Apr 08 20:59:11 2013 -0500
summary:
  #17657: merge with 3.3.

files:
  Lib/idlelib/aboutDialog.py |  7 +------
  Misc/NEWS                  |  3 +++
  2 files changed, 4 insertions(+), 6 deletions(-)


diff --git a/Lib/idlelib/aboutDialog.py b/Lib/idlelib/aboutDialog.py
--- a/Lib/idlelib/aboutDialog.py
+++ b/Lib/idlelib/aboutDialog.py
@@ -66,12 +66,7 @@
         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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1028,6 +1028,9 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list