From b0923c33c06392ee641b97bd5dbdef136860433c Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Wed, 18 Feb 2026 18:54:55 +0330 Subject: [PATCH 1/6] fix : CLI structure modified --- reserver/__main__.py | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/reserver/__main__.py b/reserver/__main__.py index 075a785..3a76ff7 100644 --- a/reserver/__main__.py +++ b/reserver/__main__.py @@ -6,13 +6,8 @@ from .functions import reserver_help from .uploader import PyPIUploader - -def main(): - """ - CLI main function. - - :return: None - """ +def _parse_args(): + """Parse arguments.""" parser = argparse.ArgumentParser() parser.add_argument( '--name', @@ -39,6 +34,16 @@ def main(): parser.add_argument('--version', help="version", action='store_true', default=False) parser.add_argument('-v', help="version", action='store_true', default=False) args = parser.parse_known_args()[0] + return args + + +def _run(args): + """ + Run reserver CLI. + + :param args: arguments + :type args: argparse.Namespace + """ if args.version or args.v: print(RESERVER_VERSION) return @@ -55,5 +60,16 @@ def main(): parser.print_help() +def main(): + """ + CLI main function. + + :return: None + """ + args = _parse_args() + _run(args) + + + if __name__ == "__main__": main() From a3f16a78943bdc968b7cffa8f5548ce3a923f47f Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Wed, 18 Feb 2026 18:57:12 +0330 Subject: [PATCH 2/6] fix : exit message added --- reserver/__main__.py | 9 ++++++--- reserver/params.py | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/reserver/__main__.py b/reserver/__main__.py index 3a76ff7..7e44f83 100644 --- a/reserver/__main__.py +++ b/reserver/__main__.py @@ -2,7 +2,7 @@ """Reserver main.""" import argparse from art import tprint -from .params import RESERVER_VERSION +from .params import RESERVER_VERSION, EXIT_MESSAGE from .functions import reserver_help from .uploader import PyPIUploader @@ -66,8 +66,11 @@ def main(): :return: None """ - args = _parse_args() - _run(args) + try: + args = _parse_args() + _run(args) + except (KeyboardInterrupt, EOFError): + print(EXIT_MESSAGE) diff --git a/reserver/params.py b/reserver/params.py index 008709a..f9a0521 100644 --- a/reserver/params.py +++ b/reserver/params.py @@ -28,3 +28,5 @@ MAIN_PYPI_REVOKE_TOKEN_MESSAGE = "Security Tip: Please consider revoking your PyPI token from https://pypi.org/manage/account/token if no longer needed." TEST_PYPI_REVOKE_TOKEN_MESSAGE = "Security Tip: Please consider revoking your test PyPI token from https://test.pypi.org/manage/account/token if no longer needed." + +EXIT_MESSAGE = "See you. Bye!" From 732dadf365df89b0427024b93699af123f67cdc4 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Wed, 18 Feb 2026 18:58:12 +0330 Subject: [PATCH 3/6] doc : CHANGELOG.md updated --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d3102d..f0a3e7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] ### Changed +- CLI messages updated +- CLI modified - `README.md` updated - `Python 3.14` added to `test.yml` - Test system modified From a6afcba2c38afd9aff9d1ab8d7ac214448e0e0a8 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Wed, 18 Feb 2026 18:59:11 +0330 Subject: [PATCH 4/6] fix : minor edit in __init__.py --- reserver/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reserver/__init__.py b/reserver/__init__.py index e89d5b9..9a58254 100644 --- a/reserver/__init__.py +++ b/reserver/__init__.py @@ -5,3 +5,5 @@ from .errors import ReserverBaseError __version__ = RESERVER_VERSION + +__all__ = ["PyPIUploader", "ReserverBaseError"] From 2857348b4ba3f139d21043b025728b4ee38b9cca Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Wed, 18 Feb 2026 19:02:07 +0330 Subject: [PATCH 5/6] fix : trailing whitespace removed --- reserver/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reserver/__main__.py b/reserver/__main__.py index 7e44f83..278e8a3 100644 --- a/reserver/__main__.py +++ b/reserver/__main__.py @@ -71,7 +71,7 @@ def main(): _run(args) except (KeyboardInterrupt, EOFError): print(EXIT_MESSAGE) - + if __name__ == "__main__": From 8098d54f485098a8d561abfa2b385cc2a22f5ae5 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Wed, 18 Feb 2026 19:02:33 +0330 Subject: [PATCH 6/6] fix : autopep8 --- reserver/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reserver/__main__.py b/reserver/__main__.py index 278e8a3..1be93fa 100644 --- a/reserver/__main__.py +++ b/reserver/__main__.py @@ -6,6 +6,7 @@ from .functions import reserver_help from .uploader import PyPIUploader + def _parse_args(): """Parse arguments.""" parser = argparse.ArgumentParser() @@ -73,6 +74,5 @@ def main(): print(EXIT_MESSAGE) - if __name__ == "__main__": main()