[Python-checkins] cpython (merge 3.5 -> 3.5): Merged fixes for two bad bugs. This will be the new Python 3.5.0rc1.
larry.hastings
python-checkins at python.org
Tue Aug 11 03:07:35 CEST 2015
https://hg.python.org/cpython/rev/1a58b1227501
changeset: 97355:1a58b1227501
branch: 3.5
tag: v3.5.0rc1
parent: 97354:de2eefb43019
parent: 97350:e39c4373b83f
user: Larry Hastings <larry at hastings.org>
date: Sun Aug 09 21:37:20 2015 -0700
summary:
Merged fixes for two bad bugs. This will be the new Python 3.5.0rc1.
files:
.hgtags | 1 -
Lib/idlelib/configHandler.py | 18 +++++++----
Lib/test/test_asyncio/test_subprocess.py | 6 +++-
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -152,4 +152,3 @@
7a088af5615bf04024e9912068f4bd8f43ed3917 v3.5.0b2
0035fcd9b9243ae52c2e830204fd9c1f7d528534 v3.5.0b3
c0d64105463581f85d0e368e8d6e59b7fd8f12b1 v3.5.0b4
-01a684180b19a32a8e85566d43f3b62966ad0a30 v3.5.0rc1
diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -22,6 +22,7 @@
import sys
from configparser import ConfigParser
+from tkinter import TkVersion
from tkinter.font import Font, nametofont
class InvalidConfigType(Exception): pass
@@ -688,13 +689,16 @@
bold = self.GetOption(configType, section, 'font-bold', default=0,
type='bool')
if (family == 'TkFixedFont'):
- 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'
+ 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'
return (family, size, 'bold' if bold else 'normal')
def LoadCfgFiles(self):
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -417,7 +417,11 @@
def test_popen_error(self):
# Issue #24763: check that the subprocess transport is closed
# 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
popen.side_effect = exc
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list