Skip to content

bpo-27115: Move IDLE Query error blanking #18868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2020
Merged

bpo-27115: Move IDLE Query error blanking #18868

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Lib/idlelib/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ def create_widgets(self, ok_text='OK'): # Do not replace.
exists=True, root=self.parent)
self.entry_error = Label(frame, text=' ', foreground='red',
font=self.error_font)
# Display or blank error by setting ['text'] =.
entrylabel.grid(column=0, row=0, columnspan=3, padx=5, sticky=W)
self.entry.grid(column=0, row=1, columnspan=3, padx=5, sticky=W+E,
pady=[10,0])
Expand All @@ -132,7 +133,6 @@ def showerror(self, message, widget=None):

def entry_ok(self): # Example: usually replace.
"Return non-blank entry or None."
self.entry_error['text'] = ''
entry = self.entry.get().strip()
if not entry:
self.showerror('blank line.')
Expand All @@ -144,6 +144,7 @@ def ok(self, event=None): # Do not replace.

Otherwise leave dialog open for user to correct entry or cancel.
'''
self.entry_error['text'] = ''
entry = self.entry_ok()
if entry is not None:
self.result = entry
Expand Down Expand Up @@ -173,7 +174,6 @@ def __init__(self, parent, title, message, used_names,

def entry_ok(self):
"Return sensible ConfigParser section name or None."
self.entry_error['text'] = ''
name = self.entry.get().strip()
if not name:
self.showerror('no name specified.')
Expand All @@ -198,7 +198,6 @@ def __init__(self, parent, title, message, text0,

def entry_ok(self):
"Return entered module name as file path or None."
self.entry_error['text'] = ''
name = self.entry.get().strip()
if not name:
self.showerror('no name specified.')
Expand Down Expand Up @@ -311,7 +310,6 @@ def path_ok(self):

def entry_ok(self):
"Return apparently valid (name, path) or None"
self.entry_error['text'] = ''
self.path_error['text'] = ''
name = self.item_ok()
path = self.path_ok()
Expand Down Expand Up @@ -362,7 +360,6 @@ def cli_args_ok(self):

def entry_ok(self):
"Return apparently valid (cli_args, restart) or None"
self.entry_error['text'] = ''
cli_args = self.cli_args_ok()
restart = self.restartvar.get()
return None if cli_args is None else (cli_args, restart)
Expand Down