From b35af193d34d45ed068888bba8bf4d5490154e9f Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 9 Sep 2021 14:56:32 +0530 Subject: [PATCH] chore: Remove unnecessary returns, re-order cli resolution Changes suggested by LGTM https://lgtm.com/projects/g/frappe/bench/rev/pr-560978725461013796d605b409ffc5c85c774829 --- bench/cli.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/bench/cli.py b/bench/cli.py index 9d49dbbe..f194349c 100755 --- a/bench/cli.py +++ b/bench/cli.py @@ -70,23 +70,25 @@ def cli(): log("Command not being executed in bench directory", level=3) if len(sys.argv) > 2 and sys.argv[1] == "frappe": - return old_frappe_cli() + old_frappe_cli() elif len(sys.argv) > 1: - if sys.argv[1] in ["--site", "--verbose", "--force", "--profile"]: - return frappe_cmd() - if sys.argv[1] in get_cached_frappe_commands(): - return frappe_cmd() - if sys.argv[1] in get_frappe_commands(): - return frappe_cmd() - - elif sys.argv[1] == "--help": + if sys.argv[1] == "--help": print(click.Context(bench_command).get_help()) print(get_frappe_help()) return - elif sys.argv[1] in get_apps(): - return app_cmd() + if sys.argv[1] in ["--site", "--verbose", "--force", "--profile"]: + frappe_cmd() + + if sys.argv[1] in get_cached_frappe_commands(): + frappe_cmd() + + if sys.argv[1] in get_frappe_commands(): + frappe_cmd() + + if sys.argv[1] in get_apps(): + app_cmd() if not (len(sys.argv) > 1 and sys.argv[1] == "src"): atexit.register(check_latest_version) @@ -199,7 +201,7 @@ def get_frappe_help(bench_path="."): f"{python} -m frappe.utils.bench_helper get-frappe-help", cwd=sites_path ) return "\n\nFramework commands:\n" + out.split("Commands:")[1] - except: + except Exception: return ""