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

[terry.reedy]

https://hg.python.org/cpython/rev/089146b8ccc6
changeset:   98264:089146b8ccc6
parent:      98260:70cdc814dfef
parent:      98263:37195cb81b8f
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Sep 25 00:49:44 2015 -0400
summary:
  Merge with 3.5

files:
  Lib/idlelib/help.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py
--- a/Lib/idlelib/help.py
+++ b/Lib/idlelib/help.py
@@ -28,6 +28,7 @@
 from os.path import abspath, dirname, isdir, isfile, join
 from tkinter import Tk, Toplevel, Frame, Text, Scrollbar, Menu, Menubutton
 from tkinter import font as tkfont
+from idlelib.configHandler import idleConf
 
 use_ttk = False # until available to import
 if use_ttk:
@@ -158,8 +159,11 @@
     "Display help.html."
     def __init__(self, parent, filename):
         "Configure tags and feed file to parser."
+        uwide = idleConf.GetOption('main', 'EditorWindow', 'width', type='int')
+        uhigh = idleConf.GetOption('main', 'EditorWindow', 'height', type='int')
+        uhigh = 3 * uhigh // 4  # lines average 4/3 of editor line height
         Text.__init__(self, parent, wrap='word', highlightthickness=0,
-                      padx=5, borderwidth=0)
+                      padx=5, borderwidth=0, width=uwide, height=uhigh)
 
         normalfont = self.findfont(['TkDefaultFont', 'arial', 'helvetica'])
         fixedfont = self.findfont(['TkFixedFont', 'monaco', 'courier'])

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