From 4e7f6b337db61b8a106cf958f6b874157909c87a Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Thu, 16 Sep 2021 20:26:56 -0700 Subject: [PATCH] simplify yield statements --- jc/parsers/foo_s.py | 15 ++++++++------- jc/parsers/ls_s.py | 9 +++------ jc/parsers/ping_s.py | 18 ++++++------------ 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/jc/parsers/foo_s.py b/jc/parsers/foo_s.py index c14f699e..22715d92 100644 --- a/jc/parsers/foo_s.py +++ b/jc/parsers/foo_s.py @@ -63,7 +63,9 @@ def _process(proc_data): Dictionary. Structured data to conform to the schema. """ - # process the data + # + # process the data here + # return proc_data @@ -87,15 +89,14 @@ def parse(data, raw=False, quiet=False): for line in data: try: + # # parse the input here + # if quiet: - output_line['_meta'] = {'success': True} - - if raw: - yield output_line - else: - yield _process(output_line) + output_line.update(jc.utils.stream_success) + + yield output_line if raw else _process(output_line) except Exception as e: yield jc.utils.stream_error(e, quiet, line) diff --git a/jc/parsers/ls_s.py b/jc/parsers/ls_s.py index ccb94d45..9183974b 100644 --- a/jc/parsers/ls_s.py +++ b/jc/parsers/ls_s.py @@ -167,12 +167,9 @@ def parse(data, raw=False, quiet=False): output_line['date'] = ' '.join(parsed_line[5:8]) if quiet: - output_line['_meta'] = {'success': True} - - if raw: - yield output_line - else: - yield _process(output_line) + output_line.update(jc.utils.stream_success) + + yield output_line if raw else _process(output_line) except Exception as e: yield jc.utils.stream_error(e, quiet, line) diff --git a/jc/parsers/ping_s.py b/jc/parsers/ping_s.py index 60a6e81b..fbc30f79 100644 --- a/jc/parsers/ping_s.py +++ b/jc/parsers/ping_s.py @@ -192,12 +192,9 @@ def parse(data, raw=False, quiet=False): } if quiet: - output_line['_meta'] = {'success': True} - - if raw: - yield output_line - else: - yield _process(output_line) + output_line.update(jc.utils.stream_success) + + yield output_line if raw else _process(output_line) continue @@ -235,12 +232,9 @@ def parse(data, raw=False, quiet=False): } if quiet: - output_line['_meta'] = {'success': True} - - if raw: - yield output_line - else: - yield _process(output_line) + output_line.update(jc.utils.stream_success) + + yield output_line if raw else _process(output_line) except Exception as e: yield jc.utils.stream_error(e, quiet, line)