bpo-27115: Move IDLE Query error blanking (GH-18868) · python/cpython@f3f0c7a

@@ -108,6 +108,7 @@ def create_widgets(self, ok_text='OK'): # Do not replace.

108108

exists=True, root=self.parent)

109109

self.entry_error = Label(frame, text=' ', foreground='red',

110110

font=self.error_font)

111+

# Display or blank error by setting ['text'] =.

111112

entrylabel.grid(column=0, row=0, columnspan=3, padx=5, sticky=W)

112113

self.entry.grid(column=0, row=1, columnspan=3, padx=5, sticky=W+E,

113114

pady=[10,0])

@@ -132,7 +133,6 @@ def showerror(self, message, widget=None):

132133133134

def entry_ok(self): # Example: usually replace.

134135

"Return non-blank entry or None."

135-

self.entry_error['text'] = ''

136136

entry = self.entry.get().strip()

137137

if not entry:

138138

self.showerror('blank line.')

@@ -144,6 +144,7 @@ def ok(self, event=None): # Do not replace.

144144145145

Otherwise leave dialog open for user to correct entry or cancel.

146146

'''

147+

self.entry_error['text'] = ''

147148

entry = self.entry_ok()

148149

if entry is not None:

149150

self.result = entry

@@ -173,7 +174,6 @@ def __init__(self, parent, title, message, used_names,

173174174175

def entry_ok(self):

175176

"Return sensible ConfigParser section name or None."

176-

self.entry_error['text'] = ''

177177

name = self.entry.get().strip()

178178

if not name:

179179

self.showerror('no name specified.')

@@ -198,7 +198,6 @@ def __init__(self, parent, title, message, text0,

198198199199

def entry_ok(self):

200200

"Return entered module name as file path or None."

201-

self.entry_error['text'] = ''

202201

name = self.entry.get().strip()

203202

if not name:

204203

self.showerror('no name specified.')

@@ -311,7 +310,6 @@ def path_ok(self):

311310312311

def entry_ok(self):

313312

"Return apparently valid (name, path) or None"

314-

self.entry_error['text'] = ''

315313

self.path_error['text'] = ''

316314

name = self.item_ok()

317315

path = self.path_ok()

@@ -362,7 +360,6 @@ def cli_args_ok(self):

362360363361

def entry_ok(self):

364362

"Return apparently valid (cli_args, restart) or None"

365-

self.entry_error['text'] = ''

366363

cli_args = self.cli_args_ok()

367364

restart = self.restartvar.get()

368365

return None if cli_args is None else (cli_args, restart)