mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-26 11:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #16511: Use default IDLE width and height if config param is not valid.

Browse source 
Patch Serhiy Storchaka.
This commit is contained in:
Andrew Svetlov 2012-12-24 13:17:59 +02:00
parent 1c6c90fc73
commit d8590ff209
4 changed files with 48 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/idlelib/EditorWindow.py
View file

@ -172,13 +172,13 @@ class EditorWindow(object):
'recent-files.lst') 'recent-files.lst')
self.text_frame = text_frame = Frame(top) self.text_frame = text_frame = Frame(top)
self.vbar = vbar = Scrollbar(text_frame, name='vbar') self.vbar = vbar = Scrollbar(text_frame, name='vbar')
self.width = idleConf.GetOption('main','EditorWindow','width') self.width = idleConf.GetOption('main','EditorWindow','width', type='int')
text_options = { text_options = {
'name': 'text', 'name': 'text',
'padx': 5, 'padx': 5,
'wrap': 'none', 'wrap': 'none',
'width': self.width, 'width': self.width,
'height': idleConf.GetOption('main', 'EditorWindow', 'height')} 'height': idleConf.GetOption('main', 'EditorWindow', 'height', type='int')}
if TkVersion >= 8.5: if TkVersion >= 8.5:
# Starting with tk 8.5 we have to set the new tabstyle option # Starting with tk 8.5 we have to set the new tabstyle option
# to 'wordprocessor' to achieve the same display of tabs as in # to 'wordprocessor' to achieve the same display of tabs as in
@ -255,7 +255,8 @@ class EditorWindow(object):
if idleConf.GetOption('main', 'EditorWindow', 'font-bold', type='bool'): if idleConf.GetOption('main', 'EditorWindow', 'font-bold', type='bool'):
fontWeight='bold' fontWeight='bold'
text.config(font=(idleConf.GetOption('main', 'EditorWindow', 'font'), text.config(font=(idleConf.GetOption('main', 'EditorWindow', 'font'),
idleConf.GetOption('main', 'EditorWindow', 'font-size'), idleConf.GetOption('main', 'EditorWindow',
'font-size', type='int'),
fontWeight)) fontWeight))
text_frame.pack(side=LEFT, fill=BOTH, expand=1) text_frame.pack(side=LEFT, fill=BOTH, expand=1)
text.pack(side=TOP, fill=BOTH, expand=1) text.pack(side=TOP, fill=BOTH, expand=1)
@ -763,7 +764,8 @@ class EditorWindow(object):
if idleConf.GetOption('main','EditorWindow','font-bold',type='bool'): if idleConf.GetOption('main','EditorWindow','font-bold',type='bool'):
fontWeight='bold' fontWeight='bold'
self.text.config(font=(idleConf.GetOption('main','EditorWindow','font'), self.text.config(font=(idleConf.GetOption('main','EditorWindow','font'),
idleConf.GetOption('main','EditorWindow','font-size'), idleConf.GetOption('main','EditorWindow','font-size',
type='int'),
fontWeight)) fontWeight))
def RemoveKeybindings(self): def RemoveKeybindings(self):

3
Lib/idlelib/FormatParagraph.py
View file

@ -32,7 +32,8 @@ class FormatParagraph:
self.editwin = None self.editwin = None
def format_paragraph_event(self, event): def format_paragraph_event(self, event):
maxformatwidth = int(idleConf.GetOption('main','FormatParagraph','paragraph')) maxformatwidth = int(idleConf.GetOption('main','FormatParagraph',
'paragraph', type='int'))
text = self.editwin.text text = self.editwin.text
first, last = self.editwin.get_selection_indices() first, last = self.editwin.get_selection_indices()
if first and last: if first and last:

11
Lib/idlelib/configDialog.py
View file

@ -947,7 +947,7 @@ class ConfigDialog(Toplevel):
self.listFontName.select_anchor(currentFontIndex) self.listFontName.select_anchor(currentFontIndex)
##font size dropdown ##font size dropdown
fontSize=idleConf.GetOption('main','EditorWindow','font-size', fontSize=idleConf.GetOption('main','EditorWindow','font-size',
default='10') type='int', default='10')
self.optMenuFontSize.SetMenu(('7','8','9','10','11','12','13','14', self.optMenuFontSize.SetMenu(('7','8','9','10','11','12','13','14',
'16','18','20','22'),fontSize ) '16','18','20','22'),fontSize )
##fontWeight ##fontWeight
@ -1033,10 +1033,13 @@ class ConfigDialog(Toplevel):
self.autoSave.set(idleConf.GetOption('main', 'General', 'autosave', self.autoSave.set(idleConf.GetOption('main', 'General', 'autosave',
default=0, type='bool')) default=0, type='bool'))
#initial window size #initial window size
self.winWidth.set(idleConf.GetOption('main','EditorWindow','width')) self.winWidth.set(idleConf.GetOption('main','EditorWindow','width',
self.winHeight.set(idleConf.GetOption('main','EditorWindow','height')) type='int'))
self.winHeight.set(idleConf.GetOption('main','EditorWindow','height',
type='int'))
#initial paragraph reformat size #initial paragraph reformat size
self.paraWidth.set(idleConf.GetOption('main','FormatParagraph','paragraph')) self.paraWidth.set(idleConf.GetOption('main','FormatParagraph','paragraph',
type='int'))
# default source encoding # default source encoding
self.encoding.set(idleConf.GetOption('main', 'EditorWindow', self.encoding.set(idleConf.GetOption('main', 'EditorWindow',
'encoding', default='none')) 'encoding', default='none'))

51
Lib/idlelib/configHandler.py
View file

@ -237,24 +237,39 @@ class IdleConf:
printed to stderr. printed to stderr.
""" """
if self.userCfg[configType].has_option(section,option): try:
return self.userCfg[configType].Get(section, option, if self.userCfg[configType].has_option(section,option):
type=type, raw=raw) return self.userCfg[configType].Get(section, option,
elif self.defaultCfg[configType].has_option(section,option): type=type, raw=raw)
return self.defaultCfg[configType].Get(section, option, except ValueError:
type=type, raw=raw) warning = ('\n Warning: configHandler.py - IdleConf.GetOption -\n'
else: #returning default, print warning ' invalid %r value for configuration option %r\n'
if warn_on_default: ' from section %r: %r\n' %
warning = ('\n Warning: configHandler.py - IdleConf.GetOption -\n' (type, option, section,
' problem retrieving configuration option %r\n' self.userCfg[configType].Get(section, option,
' from section %r.\n' raw=raw)))
' returning default value: %r\n' % try:
(option, section, default)) sys.stderr.write(warning)
try: except IOError:
sys.stderr.write(warning) pass
except IOError: try:
pass if self.defaultCfg[configType].has_option(section,option):
return default return self.defaultCfg[configType].Get(section, option,
type=type, raw=raw)
except ValueError:
pass
#returning default, print warning
if warn_on_default:
warning = ('\n Warning: configHandler.py - IdleConf.GetOption -\n'
' problem retrieving configuration option %r\n'
' from section %r.\n'
' returning default value: %r\n' %
(option, section, default))
try:
sys.stderr.write(warning)
except IOError:
pass
return default
def SetOption(self, configType, section, option, value): def SetOption(self, configType, section, option, value):
"""In user's config file, set section's option to value. """In user's config file, set section's option to value.