happyz
/
dpt-tools
1
0
Fork 0
Code Issues 11 Pull Requests Packages Projects Releases Wiki Activity

unify Ctrl + D to exit and Ctrl + C to stop

This commit is contained in:
HappyZ 2019-01-29 14:00:32 -06:00
parent 0f04a49ef1
commit 3de5823b84
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dpt-tools.py
View File

@ -42,11 +42,16 @@ def interactive(dpt, diagnosis=False):
cmd = input(">>> ") cmd = input(">>> ")
cmd = cmd.lower() # convert to lower case cmd = cmd.lower() # convert to lower case
except KeyboardInterrupt: except KeyboardInterrupt:
print()
dpt.info_print("Press Ctrl + D to exit")
continue
except EOFError:
print() print()
dpt.info_print("Exiting... Thanks for using...") dpt.info_print("Exiting... Thanks for using...")
break break
except BaseException as e: except BaseException as e:
print() print()
cmd = ''
dpt.err_print(str(e)) dpt.err_print(str(e))
if cmd == 'root': if cmd == 'root':
obtain_diagnosis_access(dpt) obtain_diagnosis_access(dpt)

3
python_api/libInteractive.py
View File

@ -617,7 +617,8 @@ def diagnosis_cmd(dpt):
for line in resp: for line in resp:
print(line) print(line)
except KeyboardInterrupt: except KeyboardInterrupt:
break dpt.info_print("\nPress Ctrl + D to exit")
continue
except EOFError: except EOFError:
break break
except BaseException as e: except BaseException as e: