From b3d71457e951d9d382787cb82fdf77f32951337c Mon Sep 17 00:00:00 2001 From: kotfu Date: Mon, 23 Apr 2018 20:16:55 -0600 Subject: Fix parsing of input redirection and appending output --- cmd2/parsing.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'cmd2/parsing.py') diff --git a/cmd2/parsing.py b/cmd2/parsing.py index c8110667..ec8e2e84 100644 --- a/cmd2/parsing.py +++ b/cmd2/parsing.py @@ -115,14 +115,16 @@ class CommandParser(): # check for input from file inputFrom = None try: - if tokens[0] == '<': - inputFrom = ' '.join(tokens[1:]) - tokens = [] - except IndexError: + input_pos = tokens.index('<') + inputFrom = ' '.join(tokens[input_pos+1:]) + tokens = tokens[:input_pos] + except ValueError: pass # check for output redirect + output = None + outputTo = None try: output_pos = tokens.index('>') output = '>' @@ -130,13 +132,12 @@ class CommandParser(): # remove all the tokens after the output redirect tokens = tokens[:output_pos] except ValueError: - output = None - outputTo = None + pass - # check for paste buffer try: output_pos = tokens.index('>>') output = '>>' + outputTo = ' '.join(tokens[output_pos+1:]) # remove all tokens after the output redirect tokens = tokens[:output_pos] except ValueError: -- cgit v1.2.1