From c1f09326cc839611be0f4a06c8d30231083fa472 Mon Sep 17 00:00:00 2001 From: Tobotimus Date: Sun, 3 Jun 2018 07:56:28 +1000 Subject: [PATCH] [V3] Use sys.exit() over exit() (#1755) --- generate_strings.py | 14 +++++++------- redbot/launcher.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 generate_strings.py diff --git a/generate_strings.py b/generate_strings.py old mode 100644 new mode 100755 index 15b47b2a0..dad488bc7 --- a/generate_strings.py +++ b/generate_strings.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 import subprocess import os import sys @@ -13,25 +14,24 @@ def main(): os.chdir(os.path.join("redbot/cogs", d, "locales")) if "regen_messages.py" not in os.listdir(os.getcwd()): print( - "Directory 'locales' exists for {} but no 'regen_messages.py' is available!".format( - d - ) + f"Directory 'locales' exists for {d} but no 'regen_messages.py' is available!" ) - exit(1) + return 1 else: print("Running 'regen_messages.py' for {}".format(d)) retval = subprocess.run([interpreter, "regen_messages.py"]) if retval.returncode != 0: - exit(1) + return 1 os.chdir(root_dir) os.chdir("redbot/core/locales") print("Running 'regen_messages.py' for core") retval = subprocess.run([interpreter, "regen_messages.py"]) if retval.returncode != 0: - exit(1) + return 1 os.chdir(root_dir) subprocess.run(["crowdin", "upload"]) + return 0 if __name__ == "__main__": - main() + sys.exit(main()) diff --git a/redbot/launcher.py b/redbot/launcher.py index 795491ee0..e85778d7f 100644 --- a/redbot/launcher.py +++ b/redbot/launcher.py @@ -383,7 +383,7 @@ def debug_info(): + "User: {}\n".format(user_who_ran) ) print(info) - exit(0) + sys.exit(0) def main_menu():