From 7159cd1ec603f3a1d0f689420b7fc41709e42e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E5=90=B9=E6=88=91=E5=B7=B2=E6=95=A3?= Date: Wed, 8 Jan 2025 17:05:18 +0800 Subject: [PATCH] Unified 'exit' as 'sys.exit' in the code to improve cross platform compatibility Unified 'exit' as 'sys.exit' in the code to improve cross platform compatibility --- mycli/main.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mycli/main.py b/mycli/main.py index e480fead..be15e343 100755 --- a/mycli/main.py +++ b/mycli/main.py @@ -524,14 +524,14 @@ def _connect(): port = int(port) except ValueError: self.echo("Error: Invalid port number: '{0}'.".format(port), err=True, fg="red") - exit(1) + sys.exit(1) _connect() except Exception as e: # Connecting to a database could fail. self.logger.debug("Database connection failed: %r.", e) self.logger.error("traceback: %r", traceback.format_exc()) self.echo(str(e), err=True, fg="red") - exit(1) + sys.exit(1) def get_password_from_file(self, password_file): password_from_file = None @@ -1224,10 +1224,10 @@ def cli( alias_dsn = mycli.config["alias_dsn"] except KeyError: click.secho("Invalid DSNs found in the config file. " 'Please check the "[alias_dsn]" section in myclirc.', err=True, fg="red") - exit(1) + sys.exit(1) except Exception as e: click.secho(str(e), err=True, fg="red") - exit(1) + sys.exit(1) for alias, value in alias_dsn.items(): if verbose: click.secho("{} : {}".format(alias, value)) @@ -1279,7 +1279,7 @@ def cli( err=True, fg="red", ) - exit(1) + sys.exit(1) else: mycli.dsn_alias = dsn @@ -1342,10 +1342,10 @@ def cli( mycli.formatter.format_name = "tsv" mycli.run_query(execute) - exit(0) + sys.exit(0) except Exception as e: click.secho(str(e), err=True, fg="red") - exit(1) + sys.exit(1) if sys.stdin.isatty(): mycli.run_cli() @@ -1357,7 +1357,7 @@ def cli( click.secho("Failed! Ran out of memory.", err=True, fg="red") click.secho("You might want to try the official mysql client.", err=True, fg="red") click.secho("Sorry... :(", err=True, fg="red") - exit(1) + sys.exit(1) if mycli.destructive_warning and is_destructive(stdin_text): try: @@ -1366,7 +1366,7 @@ def cli( except (IOError, OSError): mycli.logger.warning("Unable to open TTY as stdin.") if not warn_confirmed: - exit(0) + sys.exit(0) try: new_line = True @@ -1377,10 +1377,10 @@ def cli( mycli.formatter.format_name = "tsv" mycli.run_query(stdin_text, new_line=new_line) - exit(0) + sys.exit(0) except Exception as e: click.secho(str(e), err=True, fg="red") - exit(1) + sys.exit(1) def need_completion_refresh(queries):