[Python-checkins] cpython (merge 3.6 -> default): Merge with 3.6

[terry.reedy]

https://hg.python.org/cpython/rev/e1dfecfcfa04
changeset:   104967:e1dfecfcfa04
parent:      104965:cf7711887b4a
parent:      104966:f604b6ebd802
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Mon Nov 07 23:15:10 2016 -0500
summary:
  Merge with 3.6

files:
  Lib/idlelib/config-main.def                |   2 +
  Lib/idlelib/idle_test/test_configdialog.py |  20 ++++++----
  2 files changed, 14 insertions(+), 8 deletions(-)


diff --git a/Lib/idlelib/config-main.def b/Lib/idlelib/config-main.def
--- a/Lib/idlelib/config-main.def
+++ b/Lib/idlelib/config-main.def
@@ -60,6 +60,8 @@
 width= 80
 height= 40
 font= TkFixedFont
+# For TkFixedFont, the actual size and boldness are obtained from tk
+# and override 10 and 0.  See idlelib.config.IdleConf.GetFont
 font-size= 10
 font-bold= 0
 encoding= none
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -54,25 +54,29 @@
         changes.clear()
 
     def test_font(self):
+        # Set values guaranteed not to be defaults.
+        dfont = idleConf.GetFont(root, 'main', 'EditorWindow')
+        dsize = str(dfont[1])
+        dbold = dfont[2] == 'bold'
         configure.fontName.set('Test Font')
         expected = [
             ('main', 'EditorWindow', 'font', 'Test Font'),
-            ('main', 'EditorWindow', 'font-size', '10'),
-            ('main', 'EditorWindow', 'font-bold', False)]
+            ('main', 'EditorWindow', 'font-size', dsize),
+            ('main', 'EditorWindow', 'font-bold', dbold)]
         self.assertEqual(changes, expected)
         changes.clear()
-        configure.fontSize.set(12)
+        configure.fontSize.set(20)
         expected = [
             ('main', 'EditorWindow', 'font', 'Test Font'),
-            ('main', 'EditorWindow', 'font-size', '12'),
-            ('main', 'EditorWindow', 'font-bold', False)]
+            ('main', 'EditorWindow', 'font-size', '20'),
+            ('main', 'EditorWindow', 'font-bold', dbold)]
         self.assertEqual(changes, expected)
         changes.clear()
-        configure.fontBold.set(True)
+        configure.fontBold.set(not dbold)
         expected = [
             ('main', 'EditorWindow', 'font', 'Test Font'),
-            ('main', 'EditorWindow', 'font-size', '12'),
-            ('main', 'EditorWindow', 'font-bold', True)]
+            ('main', 'EditorWindow', 'font-size', '20'),
+            ('main', 'EditorWindow', 'font-bold', not dbold)]
         self.assertEqual(changes, expected)
 
     #def test_sample(self): pass  # TODO

-- 
Repository URL: https://hg.python.org/cpython