traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #24745: merge from 3.5

This commit is contained in:
Ned Deily 2015-08-09 23:23:21 -04:00
parent 31978d9ff4 4a3d96cafb
commit 76ba13bf71
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/idlelib/configHandler.py
View File

@ -22,6 +22,7 @@ import os
import sys import sys
from configparser import ConfigParser from configparser import ConfigParser
from tkinter import TkVersion
from tkinter.font import Font, nametofont from tkinter.font import Font, nametofont
class InvalidConfigType(Exception): pass class InvalidConfigType(Exception): pass
@ -688,13 +689,16 @@ class IdleConf:
bold = self.GetOption(configType, section, 'font-bold', default=0, bold = self.GetOption(configType, section, 'font-bold', default=0,
type='bool') type='bool')
if (family == 'TkFixedFont'): if (family == 'TkFixedFont'):
f = Font(name='TkFixedFont', exists=True, root=root) if TkVersion < 8.5:
actualFont = Font.actual(f) family = 'Courier'
family = actualFont['family'] else:
size = actualFont['size'] f = Font(name='TkFixedFont', exists=True, root=root)
if size < 0: actualFont = Font.actual(f)
size = 10 # if font in pixels, ignore actual size family = actualFont['family']
bold = actualFont['weight']=='bold' 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') return (family, size, 'bold' if bold else 'normal')
def LoadCfgFiles(self): def LoadCfgFiles(self):