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

Thu Nov 12 15:25:36 EST 2015

https://hg.python.org/cpython/rev/e25a73751f81
changeset: 99099:e25a73751f81
parent: 99095:07222a8bcadf
parent: 99098:9cf274b2248e
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Thu Nov 12 15:25:07 2015 -0500
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
@@ -395,7 +395,7 @@
 theme = self.GetOption('main', 'Theme', 'name', default='')
 source = self.defaultCfg if default else self.userCfg
 if source['highlight'].has_section(theme):
- return theme
+ return theme
 else:
 return "IDLE Classic"
 
-- 
Repository URL: https://hg.python.org/cpython
