[3.6] bpo-24813: IDLE: Add default title to help_about (GH-2366) (#2369)
Patch by Cheryl Sabella.
(cherry picked from commit 18ede06)
diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py
index e65e67c..a2ac316 100644
--- a/Lib/idlelib/help_about.py
+++ b/Lib/idlelib/help_about.py
@@ -2,7 +2,7 @@
"""
import os
-from sys import version
+from platform import python_version
from tkinter import Toplevel, Frame, Label, Button, PhotoImage
from tkinter import SUNKEN, TOP, BOTTOM, LEFT, X, BOTH, W, EW, NSEW, E
@@ -14,7 +14,7 @@
"""Modal about dialog for idle
"""
- def __init__(self, parent, title, _htest=False, _utest=False):
+ def __init__(self, parent, title=None, _htest=False, _utest=False):
"""Create popup, do not return until tk widget destroyed.
parent - parent of this dialog
@@ -32,7 +32,7 @@
self.fg = "#ffffff"
self.create_widgets()
self.resizable(height=False, width=False)
- self.title(title)
+ self.title(title or f'About IDLE {python_version()}')
self.transient(parent)
self.grab_set()
self.protocol("WM_DELETE_WINDOW", self.ok)
@@ -48,7 +48,6 @@
self.wait_window()
def create_widgets(self):
- release = version[:version.index(' ')]
frame = Frame(self, borderwidth=2, relief=SUNKEN)
frame_buttons = Frame(self)
frame_buttons.pack(side=BOTTOM, fill=X)
@@ -80,7 +79,7 @@
justify=LEFT, fg=self.fg, bg=self.bg)
email.grid(row=6, column=0, columnspan=2, sticky=W, padx=10, pady=0)
docs = Label(frame_background, text='https://docs.python.org/' +
- version[:3] + '/library/idle.html',
+ python_version()[:3] + '/library/idle.html',
justify=LEFT, fg=self.fg, bg=self.bg)
docs.grid(row=7, column=0, columnspan=2, sticky=W, padx=10, pady=0)
@@ -88,7 +87,8 @@
height=2, bg=self.bg).grid(row=8, column=0, sticky=EW,
columnspan=3, padx=5, pady=5)
- pyver = Label(frame_background, text='Python version: ' + release,
+ pyver = Label(frame_background,
+ text='Python version: ' + python_version(),
fg=self.fg, bg=self.bg)
pyver.grid(row=9, column=0, sticky=W, padx=10, pady=0)
tkver = Label(frame_background, text='Tk version: ' + tk_patchlevel,
@@ -113,7 +113,8 @@
height=2, bg=self.bg).grid(row=11, column=0, sticky=EW,
columnspan=3, padx=5, pady=5)
- idlever = Label(frame_background, text='IDLE version: ' + release,
+ idlever = Label(frame_background,
+ text='IDLE version: ' + python_version(),
fg=self.fg, bg=self.bg)
idlever.grid(row=12, column=0, sticky=W, padx=10, pady=0)
idle_buttons = Frame(frame_background, bg=self.bg)