mirror of
https://github.com/python/cpython.git
synced 2025-07-19 09:15:34 +00:00
Issue #24745: Prevent IDLE initialization crash with Tk 8.4; patch by Ned Deily.
This commit is contained in:
parent
528a9ab1f0
commit
4fda56f44b
1 changed files with 11 additions and 7 deletions
|
@ -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,6 +689,9 @@ 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'):
|
||||||
|
if TkVersion < 8.5:
|
||||||
|
family = 'Courier'
|
||||||
|
else:
|
||||||
f = Font(name='TkFixedFont', exists=True, root=root)
|
f = Font(name='TkFixedFont', exists=True, root=root)
|
||||||
actualFont = Font.actual(f)
|
actualFont = Font.actual(f)
|
||||||
family = actualFont['family']
|
family = actualFont['family']
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue