From 3de5823b8441ae4a54921fe75b4e63951987b199 Mon Sep 17 00:00:00 2001 From: HappyZ Date: Tue, 29 Jan 2019 14:00:32 -0600 Subject: [PATCH] unify Ctrl + D to exit and Ctrl + C to stop --- dpt-tools.py | 5 +++++ python_api/libInteractive.py | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dpt-tools.py b/dpt-tools.py index 7ba73b7..abc978a 100644 --- a/dpt-tools.py +++ b/dpt-tools.py @@ -42,11 +42,16 @@ def interactive(dpt, diagnosis=False): cmd = input(">>> ") cmd = cmd.lower() # convert to lower case except KeyboardInterrupt: + print() + dpt.info_print("Press Ctrl + D to exit") + continue + except EOFError: print() dpt.info_print("Exiting... Thanks for using...") break except BaseException as e: print() + cmd = '' dpt.err_print(str(e)) if cmd == 'root': obtain_diagnosis_access(dpt) diff --git a/python_api/libInteractive.py b/python_api/libInteractive.py index f408259..5b42fec 100644 --- a/python_api/libInteractive.py +++ b/python_api/libInteractive.py @@ -617,7 +617,8 @@ def diagnosis_cmd(dpt): for line in resp: print(line) except KeyboardInterrupt: - break + dpt.info_print("\nPress Ctrl + D to exit") + continue except EOFError: break except BaseException as e: