mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Issue #27609: Explicitly return None when there are other returns.

Browse source 
In a few cases, reverse a condition and eliminate a return.
This commit is contained in:
Terry Jan Reedy 2016-07-24 20:35:43 -04:00
parent cd28013d00
commit c74fb9c6c5
2 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Lib/idlelib/autocomplete.py
View file

@ -37,16 +37,14 @@ class AutoComplete:
def __init__(self, editwin=None):
self.editwin = editwin
if editwin is None: # subprocess and test
return
self.text = editwin.text
self.autocompletewindow = None
# id of delayed call, and the index of the text insert when the delayed
# call was issued. If _delayed_completion_id is None, there is no
# delayed call.
self._delayed_completion_id = None
self._delayed_completion_index = None
if editwin is not None: # not in subprocess or test
self.text = editwin.text
self.autocompletewindow = None
# id of delayed call, and the index of the text insert when
# the delayed call was issued. If _delayed_completion_id is
# None, there is no delayed call.
self._delayed_completion_id = None
self._delayed_completion_index = None
def _make_autocomplete_window(self):
return autocomplete_w.AutoCompleteWindow(self.text)
@ -82,7 +80,7 @@ class AutoComplete:
"""
if hasattr(event, "mc_state") and event.mc_state:
# A modifier was pressed along with the tab, continue as usual.
return
return None
if self.autocompletewindow and self.autocompletewindow.is_active():
self.autocompletewindow.complete()
return "break"
@ -101,9 +99,8 @@ class AutoComplete:
def _delayed_open_completions(self, *args):
self._delayed_completion_id = None
if self.text.index("insert") != self._delayed_completion_index:
return
self.open_completions(*args)
if self.text.index("insert") == self._delayed_completion_index:
self.open_completions(*args)
def open_completions(self, evalfuncs, complete, userWantsWin, mode=None):
"""Find the completions and create the AutoCompleteWindow.
@ -148,17 +145,17 @@ class AutoComplete:
comp_what = hp.get_expression()
if not comp_what or \
(not evalfuncs and comp_what.find('(') != -1):
return
return None
else:
comp_what = ""
else:
return
return None
if complete and not comp_what and not comp_start:
return
return None
comp_lists = self.fetch_completions(comp_what, mode)
if not comp_lists[0]:
return
return None
self.autocompletewindow = self._make_autocomplete_window()
return not self.autocompletewindow.show_window(
comp_lists, "insert-%dc" % len(comp_start),