[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

Tue Oct 14 22:57:37 CEST 2014

https://hg.python.org/cpython/rev/1e1f275ee9a1
changeset: 93056:1e1f275ee9a1
parent: 93053:6098141155f9
parent: 93055:db5e431125b1
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Tue Oct 14 16:56:57 2014 -0400
summary:
 Merge with 3.4
files:
 Lib/idlelib/aboutDialog.py | 4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Lib/idlelib/aboutDialog.py b/Lib/idlelib/aboutDialog.py
--- a/Lib/idlelib/aboutDialog.py
+++ b/Lib/idlelib/aboutDialog.py
@@ -4,6 +4,7 @@
 
 from tkinter import *
 import os
+import sys
 
 from idlelib import textView
 from idlelib import idlever
@@ -62,7 +63,8 @@
 justify=LEFT, fg=self.fg, bg=self.bg)
 labelEmail.grid(row=6, column=0, columnspan=2,
 sticky=W, padx=10, pady=0)
- labelWWW = Label(frameBg, text='www: http://www.python.org/idle/',
+ labelWWW = Label(frameBg, text='https://docs.python.org/' +
+ sys.version[:3] + '/library/idle.html',
 justify=LEFT, fg=self.fg, bg=self.bg)
 labelWWW.grid(row=7, column=0, columnspan=2, sticky=W, padx=10, pady=0)
 Frame(frameBg, borderwidth=1, relief=SUNKEN,
-- 
Repository URL: https://hg.python.org/cpython
