summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/config.py
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2016-06-10 01:09:15 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2016-06-10 01:09:15 (GMT)
commit1080d13a7da30df34de7862ea46525c2f19091c7 (patch)
tree3af70dcfb4ec7b735b79f03ac10e4c1783666894 /Lib/idlelib/config.py
parent82ae15597f1af7a0121ebf49e749dda673d4e3d6 (diff)
downloadcpython-1080d13a7da30df34de7862ea46525c2f19091c7.zip
cpython-1080d13a7da30df34de7862ea46525c2f19091c7.tar.gz
cpython-1080d13a7da30df34de7862ea46525c2f19091c7.tar.bz2
Issue #24759: IDLE requires tk 8.5 and availability ttk widgets.
Delete now unneeded tk version tests and code for older versions.
Diffstat (limited to 'Lib/idlelib/config.py')
-rw-r--r--Lib/idlelib/config.py20
1 files changed, 8 insertions, 12 deletions
diff --git a/Lib/idlelib/config.py b/Lib/idlelib/config.py
index b9e1c6d..4d87de0 100644
--- a/Lib/idlelib/config.py
+++ b/Lib/idlelib/config.py
@@ -22,7 +22,6 @@ import os
import sys
from configparser import ConfigParser
-from tkinter import TkVersion
from tkinter.font import Font, nametofont
class InvalidConfigType(Exception): pass
@@ -713,16 +712,13 @@ class IdleConf:
bold = self.GetOption(configType, section, 'font-bold', default=0,
type='bool')
if (family == 'TkFixedFont'):
- if TkVersion < 8.5:
- family = 'Courier'
- else:
- f = Font(name='TkFixedFont', exists=True, root=root)
- actualFont = Font.actual(f)
- family = actualFont['family']
- size = actualFont['size']
- if size <= 0:
- size = 10 # if font in pixels, ignore actual size
- bold = actualFont['weight']=='bold'
+ f = Font(name='TkFixedFont', exists=True, root=root)
+ actualFont = Font.actual(f)
+ family = actualFont['family']
+ size = actualFont['size']
+ if size <= 0:
+ size = 10 # if font in pixels, ignore actual size
+ bold = actualFont['weight'] == 'bold'
return (family, size, 'bold' if bold else 'normal')
def LoadCfgFiles(self):
@@ -740,7 +736,7 @@ class IdleConf:
idleConf = IdleConf()
# TODO Revise test output, write expanded unittest
-### module test
+#
if __name__ == '__main__':
def dumpCfg(cfg):
print('\n', cfg, '\n')