mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 13:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged fixes for two bad bugs. This will be the new Python 3.5.0rc1.

Browse source
This commit is contained in:
Larry Hastings 2015-08-09 21:37:20 -07:00
commit 73b4a7a794
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.hgtags
View file

@ -152,4 +152,3 @@ b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
7a088af5615bf04024e9912068f4bd8f43ed3917 v3.5.0b2 7a088af5615bf04024e9912068f4bd8f43ed3917 v3.5.0b2
0035fcd9b9243ae52c2e830204fd9c1f7d528534 v3.5.0b3 0035fcd9b9243ae52c2e830204fd9c1f7d528534 v3.5.0b3
c0d64105463581f85d0e368e8d6e59b7fd8f12b1 v3.5.0b4 c0d64105463581f85d0e368e8d6e59b7fd8f12b1 v3.5.0b4
01a684180b19a32a8e85566d43f3b62966ad0a30 v3.5.0rc1

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):

6
Lib/test/test_asyncio/test_subprocess.py
View file

@ -417,7 +417,11 @@ class SubprocessMixin:
def test_popen_error(self): def test_popen_error(self):
# Issue #24763: check that the subprocess transport is closed # Issue #24763: check that the subprocess transport is closed
# when BaseSubprocessTransport fails # when BaseSubprocessTransport fails
with mock.patch('subprocess.Popen') as popen: if sys.platform == 'win32':
target = 'asyncio.windows_utils.Popen'
else:
target = 'subprocess.Popen'
with mock.patch(target) as popen:
exc = ZeroDivisionError exc = ZeroDivisionError
popen.side_effect = exc popen.side_effect = exc