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

larryhastings · larryhastings · commit 73b4a7a79430 · 2015-08-09T21:37:20.000-07:00
diff --git a/.hgtags b/.hgtags
@@ -152,4 +152,3 @@ b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.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
@@ -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 @@ def GetFont(self, root, configType, section):
         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
@@ -417,7 +417,11 @@ def kill_running():
     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
 
