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

[terry.reedy]

https://hg.python.org/cpython/rev/7eb20f06c6e9
changeset:   101480:7eb20f06c6e9
parent:      101477:09af54099973
parent:      101479:1464df337152
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sun May 22 14:35:43 2016 -0400
summary:
  Merge with 3.5

files:
  Lib/idlelib/configHandler.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -720,7 +720,7 @@
                 actualFont = Font.actual(f)
                 family = actualFont['family']
                 size = actualFont['size']
-                if size < 0:
+                if size <= 0:
                     size = 10  # if font in pixels, ignore actual size
                 bold = actualFont['weight']=='bold'
         return (family, size, 'bold' if bold else 'normal')

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