Changeset 391 for python/trunk/Lib/idlelib/aboutDialog.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/idlelib/aboutDialog.py (modified) (3 diffs)

python/trunk/Lib/idlelib/aboutDialog.py

@@ -5 +5 @@
 from Tkinter import *
 import os
-import os.path
-import textView
-import idlever
+
+from idlelib import textView
+from idlelib import idlever
 
 class AboutDialog(Toplevel):
@@ -67 +67 @@
                                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)
@@ -145 +140 @@
     root = Tk()
     def run():
-        import aboutDialog
+        from idlelib import aboutDialog
         aboutDialog.AboutDialog(root, 'About')
     Button(root, text='Dialog', command=run).pack()