mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge with 3.5

This commit is contained in:
Terry Jan Reedy 2016-06-14 00:53:41 -04:00
parent cdd3a99106 ec84417ce8
commit d34bafa970
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/idlelib/configDialog.py
View File

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