From 065f98dda857165582aa290bd72cab6b4731c3e3 Mon Sep 17 00:00:00 2001 From: Jonathon Scanes Date: Fri, 27 Jun 2014 10:42:15 +1000 Subject: [PATCH] Printed message aborted on ctrl+c. --- jrnl/cli.py | 6 +++++- jrnl/util.py | 6 +----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jrnl/cli.py b/jrnl/cli.py index 46cecb09..1428a535 100644 --- a/jrnl/cli.py +++ b/jrnl/cli.py @@ -172,7 +172,11 @@ def run(manual_args=None): elif config['editor']: raw = util.get_text_from_editor(config) 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: args.text = [raw] else: diff --git a/jrnl/util.py b/jrnl/util.py index 5727aebb..166a0023 100644 --- a/jrnl/util.py +++ b/jrnl/util.py @@ -80,11 +80,7 @@ def py23_input(msg=""): return STDIN.readline().strip() def py23_read(msg=""): - STDERR.write(u(msg)) - try: - return STDIN.read() - except KeyboardInterrupt: - sys.exit(0) + return STDIN.read() def yesno(prompt, default=True): prompt = prompt.strip() + (" [Y/n]" if default else " [y/N]")