mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Issue #24759: IDLE requires tk 8.5 and availability ttk widgets.

Browse source 
Delete now unneeded tk version tests and code for older versions.
This commit is contained in:
Terry Jan Reedy 2016-06-09 21:09:15 -04:00
parent 82ae15597f
commit 1080d13a7d
8 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/idlelib/config.py
View file

@ -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')