From 9632ea2f26831ae3bbf41ca570d6e138c2f13656 Mon Sep 17 00:00:00 2001
From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sun, 9 Aug 2015 18:21:25 -0400
Subject: Issue #24763: Fix asyncio test on Windows (fix reverted change)

See also issue #24835
---
 Lib/test/test_asyncio/test_subprocess.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index d138c26..38f0cee 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -417,7 +417,11 @@ class SubprocessMixin:
     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
 
-- 
cgit v0.12


From 4a3d96cafbceb878e261681c1000811a8478da56 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sun, 9 Aug 2015 23:21:29 -0400
Subject: Issue #24745: Prevent IDLE initialization crash with Tk 8.4:
 "TkFixedFont" does not exist in 8.4.

---
 Lib/idlelib/configHandler.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py
index db3bcbc..83abad7 100644
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -22,6 +22,7 @@ import os
 import sys
 
 from configparser import ConfigParser
+from tkinter import TkVersion
 from tkinter.font import Font, nametofont
 
 class InvalidConfigType(Exception): pass
@@ -688,13 +689,16 @@ class IdleConf:
         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):
-- 
cgit v0.12