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

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

`

108

108

`exists=True, root=self.parent)

`

109

109

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

`

110

110

`font=self.error_font)

`

``

111

`+

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

`

111

112

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

`

112

113

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

`

113

114

`pady=[10,0])

`

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

`

132

133

``

133

134

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

`

134

135

`"Return non-blank entry or None."

`

135

``

`-

self.entry_error['text'] = ''

`

136

136

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

`

137

137

`if not entry:

`

138

138

`self.showerror('blank line.')

`

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

`

144

144

``

145

145

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

`

146

146

` '''

`

``

147

`+

self.entry_error['text'] = ''

`

147

148

`entry = self.entry_ok()

`

148

149

`if entry is not None:

`

149

150

`self.result = entry

`

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

`

173

174

``

174

175

`def entry_ok(self):

`

175

176

`"Return sensible ConfigParser section name or None."

`

176

``

`-

self.entry_error['text'] = ''

`

177

177

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

`

178

178

`if not name:

`

179

179

`self.showerror('no name specified.')

`

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

`

198

198

``

199

199

`def entry_ok(self):

`

200

200

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

`

201

``

`-

self.entry_error['text'] = ''

`

202

201

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

`

203

202

`if not name:

`

204

203

`self.showerror('no name specified.')

`

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

`

311

310

``

312

311

`def entry_ok(self):

`

313

312

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

`

314

``

`-

self.entry_error['text'] = ''

`

315

313

`self.path_error['text'] = ''

`

316

314

`name = self.item_ok()

`

317

315

`path = self.path_ok()

`

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

`

362

360

``

363

361

`def entry_ok(self):

`

364

362

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

`

365

``

`-

self.entry_error['text'] = ''

`

366

363

`cli_args = self.cli_args_ok()

`

367

364

`restart = self.restartvar.get()

`

368

365

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

`