Accept various automated refactorings from ruff RET ruleset that eliminated else case when the if had a return

Author: tleonhardt

cmd2/argparse_custom.py

@@ -477,7 +477,7 @@ def _action_set_choices_callable(self: argparse.Action, choices_callable: Choice
     if self.choices is not None:
         err_msg = "None of the following parameters can be used alongside a choices parameter:\nchoices_provider, completer"
         raise (TypeError(err_msg))
-    elif self.nargs == 0:
+    if self.nargs == 0:
         err_msg = (
             "None of the following parameters can be used on an action that takes no arguments:\nchoices_provider, completer"
         )
@@ -1155,24 +1155,22 @@ def _format_action_invocation(self, action: argparse.Action) -> str:
             (metavar,) = self._metavar_formatter(action, default)(1)
             return metavar
 
-        else:
-            parts: List[str] = []
+        parts: List[str] = []
 
-            # if the Optional doesn't take a value, format is:
-            #    -s, --long
-            if action.nargs == 0:
-                parts.extend(action.option_strings)
-                return ', '.join(parts)
+        # if the Optional doesn't take a value, format is:
+        #    -s, --long
+        if action.nargs == 0:
+            parts.extend(action.option_strings)
+            return ', '.join(parts)
 
-            # Begin cmd2 customization (less verbose)
-            # if the Optional takes a value, format is:
-            #    -s, --long ARGS
-            else:
-                default = self._get_default_metavar_for_optional(action)
-                args_string = self._format_args(action, default)
+        # Begin cmd2 customization (less verbose)
+        # if the Optional takes a value, format is:
+        #    -s, --long ARGS
+        default = self._get_default_metavar_for_optional(action)
+        args_string = self._format_args(action, default)
 
-                return ', '.join(action.option_strings) + ' ' + args_string
-            # End cmd2 customization
+        return ', '.join(action.option_strings) + ' ' + args_string
+        # End cmd2 customization
 
     def _determine_metavar(
         self,
@@ -1201,8 +1199,7 @@ def _metavar_formatter(
         def format_tuple(tuple_size: int) -> Tuple[str, ...]:
             if isinstance(metavar, tuple):
                 return metavar
-            else:
-                return (metavar,) * tuple_size
+            return (metavar,) * tuple_size
 
         return format_tuple
 
@@ -1223,12 +1220,12 @@ def _format_args(self, action: argparse.Action, default_metavar: Union[str, Tupl
 
         # Make this output less verbose. Do not customize the output when metavar is a
         # tuple of strings. Allow argparse's formatter to handle that instead.
-        elif isinstance(metavar, str):
+        if isinstance(metavar, str):
             if action.nargs == ZERO_OR_MORE:
                 return '[%s [...]]' % metavar_formatter(1)
-            elif action.nargs == ONE_OR_MORE:
+            if action.nargs == ONE_OR_MORE:
                 return '%s [...]' % metavar_formatter(1)
-            elif isinstance(action.nargs, int) and action.nargs > 1:
+            if isinstance(action.nargs, int) and action.nargs > 1:
                 return '{}{{{}}}'.format('%s' % metavar_formatter(1), action.nargs)
 
         return super()._format_args(action, default_metavar)  # type: ignore[arg-type]

cmd2/cmd2.py

@@ -1728,12 +1728,11 @@ def complete_users() -> List[str]:
                     return complete_users()
 
                 # Otherwise expand the user dir
-                else:
-                    search_str = os.path.expanduser(search_str)
+                search_str = os.path.expanduser(search_str)
 
-                    # Get what we need to restore the original tilde path later
-                    orig_tilde_path = text[:sep_index]
-                    expanded_tilde_path = os.path.expanduser(orig_tilde_path)
+                # Get what we need to restore the original tilde path later
+                orig_tilde_path = text[:sep_index]
+                expanded_tilde_path = os.path.expanduser(orig_tilde_path)
 
             # If the search text does not have a directory, then use the cwd
             elif not os.path.dirname(text):
@@ -1804,10 +1803,9 @@ def shell_cmd_complete(self, text: str, line: str, begidx: int, endidx: int, *,
             return utils.get_exes_in_path(text)
 
         # Otherwise look for executables in the given path
-        else:
-            return self.path_complete(
-                text, line, begidx, endidx, path_filter=lambda path: os.path.isdir(path) or os.access(path, os.X_OK)
-            )
+        return self.path_complete(
+            text, line, begidx, endidx, path_filter=lambda path: os.path.isdir(path) or os.access(path, os.X_OK)
+        )
 
     def _redirect_complete(self, text: str, line: str, begidx: int, endidx: int, compfunc: CompleterFunc) -> List[str]:
         """Called by complete() as the first tab completion function for all commands
@@ -1878,12 +1876,12 @@ def _redirect_complete(self, text: str, line: str, begidx: int, endidx: int, com
             if do_shell_completion:
                 return self.shell_cmd_complete(text, line, begidx, endidx)
 
-            elif do_path_completion:
+            if do_path_completion:
                 return self.path_complete(text, line, begidx, endidx)
 
             # If there were redirection strings anywhere on the command line, then we
             # are no longer tab completing for the current command
-            elif has_redirection:
+            if has_redirection:
                 return []
 
         # Call the command's completer function
@@ -2771,9 +2769,8 @@ def combine_rl_history(statement: Statement) -> None:
 
         if not statement.command:
             raise EmptyStatement
-        else:
-            # If necessary, update history with completed multiline command.
-            combine_rl_history(statement)
+        # If necessary, update history with completed multiline command.
+        combine_rl_history(statement)
 
         return statement
 
@@ -2940,10 +2937,9 @@ def _redirect_output(self, statement: Statement) -> utils.RedirectionSavedState:
                 subproc_stdin.close()
                 new_stdout.close()
                 raise RedirectionError(f'Pipe process exited with code {proc.returncode} before command could run')
-            else:
-                redir_saved_state.redirecting = True  # type: ignore[unreachable]
-                cmd_pipe_proc_reader = utils.ProcReader(proc, cast(TextIO, self.stdout), sys.stderr)
-                sys.stdout = self.stdout = new_stdout
+            redir_saved_state.redirecting = True  # type: ignore[unreachable]
+            cmd_pipe_proc_reader = utils.ProcReader(proc, cast(TextIO, self.stdout), sys.stderr)
+            sys.stdout = self.stdout = new_stdout
 
         elif statement.output:
             if statement.output_to:
@@ -3080,14 +3076,13 @@ def default(self, statement: Statement) -> Optional[bool]:  # type: ignore[overr
                 self.history.append(statement)
 
             return self.do_shell(statement.command_and_args)
-        else:
-            err_msg = self.default_error.format(statement.command)
-            if self.suggest_similar_command and (suggested_command := self._suggest_similar_command(statement.command)):
-                err_msg += f"\n{self.default_suggestion_message.format(suggested_command)}"
+        err_msg = self.default_error.format(statement.command)
+        if self.suggest_similar_command and (suggested_command := self._suggest_similar_command(statement.command)):
+            err_msg += f"\n{self.default_suggestion_message.format(suggested_command)}"
 
-            # Set apply_style to False so styles for default_error and default_suggestion_message are not overridden
-            self.perror(err_msg, apply_style=False)
-            return None
+        # Set apply_style to False so styles for default_error and default_suggestion_message are not overridden
+        self.perror(err_msg, apply_style=False)
+        return None
 
     def _suggest_similar_command(self, command: str) -> Optional[str]:
         return suggest_similar(command, self.get_visible_commands())
@@ -5092,8 +5087,7 @@ def _current_script_dir(self) -> Optional[str]:
         """Accessor to get the current script directory from the _script_dir LIFO queue."""
         if self._script_dir:
             return self._script_dir[-1]
-        else:
-            return None
+        return None
 
     run_script_description = (
         "Run commands in script file that is encoded as either ASCII or UTF-8 text\n"
@@ -5748,5 +5742,4 @@ def _resolve_func_self(
                     # Case 3: There exists exactly 1 CommandSet that is a sub-class match of the function's CommandSet
                     func_self = candidate_sets[0]
             return func_self
-        else:
-            return self
+        return self

cmd2/decorators.py

@@ -195,8 +195,7 @@ def cmd_wrapper(*args: Any, **kwargs: Any) -> Optional[bool]:
 
     if callable(func_arg):
         return arg_decorator(func_arg)
-    else:
-        return arg_decorator
+    return arg_decorator
 
 
 def _set_parser_prog(parser: argparse.ArgumentParser, prog: str) -> None:
@@ -245,7 +244,7 @@ def _set_parser_prog(parser: argparse.ArgumentParser, prog: str) -> None:
             break
 
         # Need to save required args so they can be prepended to the subcommand usage
-        elif action.required:
+        if action.required:
             req_args.append(action.dest)
 
 

cmd2/history.py

@@ -211,10 +211,9 @@ def get(self, index: int) -> HistoryItem:
         """
         if index == 0:
             raise IndexError('The first command in history is command 1.')
-        elif index < 0:
+        if index < 0:
             return self[index]
-        else:
-            return self[index - 1]
+        return self[index - 1]
 
     # This regular expression parses input for the span() method. There are five parts:
     #

cmd2/parsing.py

@@ -636,8 +636,7 @@ def get_command_arg_list(
 
         if preserve_quotes:
             return to_parse, to_parse.arg_list
-        else:
-            return to_parse, to_parse.argv[1:]
+        return to_parse, to_parse.argv[1:]
 
     def _expand(self, line: str) -> str:
         """Expand aliases and shortcuts"""

cmd2/py_bridge.py

@@ -78,8 +78,7 @@ def __bool__(self) -> bool:
             return bool(self.data)
 
         # Otherwise check if stderr was filled out
-        else:
-            return not self.stderr
+        return not self.stderr
 
 
 class PyBridge:

cmd2/rl_utils.py

@@ -187,11 +187,10 @@ def rl_get_point() -> int:  # pragma: no cover
     if rl_type == RlType.GNU:
         return ctypes.c_int.in_dll(readline_lib, "rl_point").value
 
-    elif rl_type == RlType.PYREADLINE:
+    if rl_type == RlType.PYREADLINE:
         return int(readline.rl.mode.l_buffer.point)
 
-    else:
-        return 0
+    return 0
 
 
 def rl_get_prompt() -> str:  # pragma: no cover
@@ -230,8 +229,7 @@ def rl_get_display_prompt() -> str:  # pragma: no cover
         else:
             prompt = encoded_prompt.decode(encoding='utf-8')
         return rl_unescape_prompt(prompt)
-    else:
-        return rl_get_prompt()
+    return rl_get_prompt()
 
 
 def rl_set_prompt(prompt: str) -> None:  # pragma: no cover
@@ -278,8 +276,7 @@ def rl_escape_prompt(prompt: str) -> str:
 
         return result
 
-    else:
-        return prompt
+    return prompt
 
 
 def rl_unescape_prompt(prompt: str) -> str:
@@ -302,7 +299,7 @@ def rl_in_search_mode() -> bool:  # pragma: no cover
 
         readline_state = ctypes.c_int.in_dll(readline_lib, "rl_readline_state").value
         return bool(IN_SEARCH_MODE & readline_state)
-    elif rl_type == RlType.PYREADLINE:
+    if rl_type == RlType.PYREADLINE:
         from pyreadline3.modes.emacs import (  # type: ignore[import]
             EmacsMode,
         )
@@ -317,5 +314,4 @@ def rl_in_search_mode() -> bool:  # pragma: no cover
             readline.rl.mode._process_non_incremental_search_keyevent,
         )
         return readline.rl.mode.process_keyevent_queue[-1] in search_funcs
-    else:
-        return False
+    return False

cmd2/table_creator.py

@@ -98,8 +98,7 @@ def __init__(
 
         if width is not None and width < 1:
             raise ValueError("Column width cannot be less than 1")
-        else:
-            self.width: int = width if width is not None else -1
+        self.width: int = width if width is not None else -1
 
         self.header_horiz_align = header_horiz_align
         self.header_vert_align = header_vert_align
@@ -1100,10 +1099,9 @@ def apply_data_bg(self, value: Any) -> str:
         """
         if self.row_num % 2 == 0 and self.even_bg is not None:
             return ansi.style(value, bg=self.even_bg)
-        elif self.row_num % 2 != 0 and self.odd_bg is not None:
+        if self.row_num % 2 != 0 and self.odd_bg is not None:
             return ansi.style(value, bg=self.odd_bg)
-        else:
-            return str(value)
+        return str(value)
 
     def generate_data_row(self, row_data: Sequence[Any]) -> str:
         """

cmd2/transcript.py

@@ -162,25 +162,24 @@ def _transform_transcript_expected(self, s: str) -> str:
                 # no more slashes, add the rest of the string and bail
                 regex += re.escape(s[start:])
                 break
+            # there is a slash, add everything we have found so far
+            # add stuff before the first slash as plain text
+            regex += re.escape(s[start:first_slash_pos])
+            start = first_slash_pos + 1
+            # and go find the next one
+            (regex, second_slash_pos, start) = self._escaped_find(regex, s, start, True)
+            if second_slash_pos > 0:
+                # add everything between the slashes (but not the slashes)
+                # as a regular expression
+                regex += s[start:second_slash_pos]
+                # and change where we start looking for slashed on the
+                # turn through the loop
+                start = second_slash_pos + 1
             else:
-                # there is a slash, add everything we have found so far
-                # add stuff before the first slash as plain text
-                regex += re.escape(s[start:first_slash_pos])
-                start = first_slash_pos + 1
-                # and go find the next one
-                (regex, second_slash_pos, start) = self._escaped_find(regex, s, start, True)
-                if second_slash_pos > 0:
-                    # add everything between the slashes (but not the slashes)
-                    # as a regular expression
-                    regex += s[start:second_slash_pos]
-                    # and change where we start looking for slashed on the
-                    # turn through the loop
-                    start = second_slash_pos + 1
-                else:
-                    # No closing slash, we have to add the first slash,
-                    # and the rest of the text
-                    regex += re.escape(s[start - 1 :])
-                    break
+                # No closing slash, we have to add the first slash,
+                # and the rest of the text
+                regex += re.escape(s[start - 1 :])
+                break
         return regex
 
     @staticmethod
@@ -200,12 +199,12 @@ def _escaped_find(regex: str, s: str, start: int, in_regex: bool) -> Tuple[str,
             if pos == -1:
                 # no match, return to caller
                 break
-            elif pos == 0:
+            if pos == 0:
                 # slash at the beginning of the string, so it can't be
                 # escaped. We found it.
                 break
             # check if the slash is preceded by a backslash
-            elif s[pos - 1 : pos] == '\\':
+            if s[pos - 1 : pos] == '\\':
                 # it is.
                 if in_regex:
                     # add everything up to the backslash as a