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

Tue Jun 14 00:54:03 EDT 2016

https://hg.python.org/cpython/rev/e3275bde7982
changeset: 102003:e3275bde7982
parent: 102002:7948633608d5
parent: 102001:438359d00a83
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Tue Jun 14 00:53:41 2016 -0400
summary:
 Merge with 3.5
files:
 Lib/idlelib/configDialog.py | 8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -752,6 +752,7 @@
 if not tkMessageBox.askyesno(
 'Delete Key Set', delmsg % keySetName, parent=self):
 return
+ self.DeactivateCurrentConfig()
 #remove key set from config
 idleConf.userCfg['keys'].remove_section(keySetName)
 if keySetName in self.changedItems['keys']:
@@ -770,7 +771,8 @@
 self.keysAreBuiltin.set(idleConf.defaultCfg['main'].Get('Keys', 'default'))
 self.builtinKeys.set(idleConf.defaultCfg['main'].Get('Keys', 'name'))
 #user can't back out of these changes, they must be applied now
- self.Apply()
+ self.SaveAllChangedConfigs()
+ self.ActivateConfigChanges()
 self.SetKeysType()
 
 def DeleteCustomTheme(self):
@@ -779,6 +781,7 @@
 if not tkMessageBox.askyesno(
 'Delete Theme', delmsg % themeName, parent=self):
 return
+ self.DeactivateCurrentConfig()
 #remove theme from config
 idleConf.userCfg['highlight'].remove_section(themeName)
 if themeName in self.changedItems['highlight']:
@@ -797,7 +800,8 @@
 self.themeIsBuiltin.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
 self.builtinTheme.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
 #user can't back out of these changes, they must be applied now
- self.Apply()
+ self.SaveAllChangedConfigs()
+ self.ActivateConfigChanges()
 self.SetThemeType()
 
 def GetColour(self):
-- 
Repository URL: https://hg.python.org/cpython
