Skip to content

Commit aa8d0a2

Browse files
csabellaterryjreedy
authored andcommitted
bpo-30851: IDLE: Remove unused tk variables in configdialog. (#2626)
One is a duplicate, one is set but cannot be altered by users. Patch by Cheryl Sabella.
1 parent 64fa449 commit aa8d0a2

File tree

2 files changed

+3
-22
lines changed

2 files changed

+3
-22
lines changed

Lib/idlelib/configdialog.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ def create_page_highlight(self):
218218
self.custom_theme = StringVar(parent)
219219
self.fg_bg_toggle = BooleanVar(parent)
220220
self.colour = StringVar(parent)
221-
# XXX - font_name is defined in create_page_font_tab. Needed here too?
222-
self.font_name = StringVar(parent)
223221
self.is_builtin_theme = BooleanVar(parent)
224222
self.highlight_target = StringVar(parent)
225223

@@ -334,8 +332,6 @@ def create_page_keys(self):
334332
keybinding: Action/key bindings.
335333
"""
336334
parent = self.parent
337-
# XXX - binding_target isn't used.
338-
self.binding_target = StringVar(parent)
339335
self.builtin_keys = StringVar(parent)
340336
self.custom_keys = StringVar(parent)
341337
self.are_keys_builtin = BooleanVar(parent)
@@ -420,18 +416,12 @@ def create_page_general(self):
420416
win_height: Initial window height in characters.
421417
startup_edit: Selector for opening in editor or shell mode.
422418
autosave: Selector for save prompt popup when using Run.
423-
encoding: ?
424419
"""
425420
parent = self.parent
426421
self.win_width = StringVar(parent)
427422
self.win_height = StringVar(parent)
428423
self.startup_edit = IntVar(parent)
429424
self.autosave = IntVar(parent)
430-
# XXX - encoding isn't on the screen to be set, but is saved to config.
431-
self.encoding = StringVar(parent)
432-
# XXX - user_help_browser and help_browser aren't used.
433-
self.user_help_browser = BooleanVar(parent)
434-
self.help_browser = StringVar(parent)
435425

436426
#widget creation
437427
#body
@@ -538,7 +528,6 @@ def attach_var_callbacks(self):
538528
self.win_height.trace_add('write', self.var_changed_win_height)
539529
self.startup_edit.trace_add('write', self.var_changed_startup_edit)
540530
self.autosave.trace_add('write', self.var_changed_autosave)
541-
self.encoding.trace_add('write', self.var_changed_encoding)
542531

543532
def remove_var_callbacks(self):
544533
"Remove callbacks to prevent memory leaks."
@@ -548,7 +537,7 @@ def remove_var_callbacks(self):
548537
self.custom_theme, self.is_builtin_theme, self.highlight_target,
549538
self.keybinding, self.builtin_keys, self.custom_keys,
550539
self.are_keys_builtin, self.win_width, self.win_height,
551-
self.startup_edit, self.autosave, self.encoding,):
540+
self.startup_edit, self.autosave,):
552541
var.trace_remove('write', var.trace_info()[0][1])
553542

554543
def var_changed_font(self, *params):
@@ -691,11 +680,6 @@ def var_changed_autosave(self, *params):
691680
value = self.autosave.get()
692681
changes.add_option('main', 'General', 'autosave', value)
693682

694-
def var_changed_encoding(self, *params):
695-
"Store change to encoding."
696-
value = self.encoding.get()
697-
changes.add_option('main', 'EditorWindow', 'encoding', value)
698-
699683
def set_theme_type(self):
700684
"Set available screen options based on builtin or custom theme."
701685
if self.is_builtin_theme.get():
@@ -819,8 +803,6 @@ def load_keys_list(self, keyset_name):
819803
An action/key binding can be selected to change the key binding.
820804
"""
821805
reselect = 0
822-
# XXX - new_keyset isn't used in this function.
823-
new_keyset = 0
824806
if self.list_bindings.curselection():
825807
reselect = 1
826808
list_index = self.list_bindings.index(ANCHOR)
@@ -1234,9 +1216,6 @@ def load_general_cfg(self):
12341216
'main', 'EditorWindow', 'width', type='int'))
12351217
self.win_height.set(idleConf.GetOption(
12361218
'main', 'EditorWindow', 'height', type='int'))
1237-
# Set default source encoding.
1238-
self.encoding.set(idleConf.GetOption(
1239-
'main', 'EditorWindow', 'encoding', default='none'))
12401219
# Set additional help sources.
12411220
self.user_helplist = idleConf.GetAllExtraHelpSourcesList()
12421221
for help_item in self.user_helplist:
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
IDLE: Remove unused variables in configdialog. One is a duplicate, one is
2+
set but cannot be altered by users. Patch by Cheryl Sabella.

0 commit comments

Comments
 (0)