fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Printed message aborted on ctrl+c.

Browse source
This commit is contained in:
Jonathon Scanes 2014-06-27 10:42:15 +10:00
parent b0fe7cd330
commit 065f98dda8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
jrnl/cli.py
View file

@ -172,7 +172,11 @@ def run(manual_args=None):
elif config['editor']: elif config['editor']:
raw = util.get_text_from_editor(config) raw = util.get_text_from_editor(config)
else: else:
raw = util.py23_read("[Compose Entry; " + _exit_multiline_code + " to finish writing]\n") try:
raw = util.py23_read("[Compose Entry; " + _exit_multiline_code + " to finish writing]\n")
except KeyboardInterrupt:
util.prompt("[Entry NOT saved to journal.]")
sys.exit(0)
if raw: if raw:
args.text = [raw] args.text = [raw]
else: else:

6
jrnl/util.py
View file

@ -80,11 +80,7 @@ def py23_input(msg=""):
return STDIN.readline().strip() return STDIN.readline().strip()
def py23_read(msg=""): def py23_read(msg=""):
STDERR.write(u(msg)) return STDIN.read()
try:
return STDIN.read()
except KeyboardInterrupt:
sys.exit(0)
def yesno(prompt, default=True): def yesno(prompt, default=True):
prompt = prompt.strip() + (" [Y/n]" if default else " [y/N]") prompt = prompt.strip() + (" [Y/n]" if default else " [y/N]")