diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-07-03 01:43:57 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-07-03 18:15:47 +0300 |
| commit | d9617a499a174cdf7f56acafc2e7eec24be478c2 (patch) | |
| tree | 4e18303374fa233a6cfaa02519234384ecc80713 /utils | |
| parent | 606741deb999598175bf8dcb5515f78b15bb3888 (diff) | |
utils: raspberrypi: ctt: json_pretty_print: Fix indentation handling
Indentation is handled by outputting spaces right after outputting a
newline character. That works in most cases, but would result in the
input '{}' being printed as
{
}
instead of
{
}
Fix it by outputting the indentation before outputting the next
character after a newline. The indentation value will be updated by
then.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Tested-by: David Plowman <david.plowman@raspberrypi.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/raspberrypi/ctt/ctt_pretty_print_json.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/utils/raspberrypi/ctt/ctt_pretty_print_json.py b/utils/raspberrypi/ctt/ctt_pretty_print_json.py index 9d450f6d..f1c61347 100644 --- a/utils/raspberrypi/ctt/ctt_pretty_print_json.py +++ b/utils/raspberrypi/ctt/ctt_pretty_print_json.py @@ -16,16 +16,20 @@ class JSONPrettyPrinter(object): "indent": 0, "inarray": [False], "arraycount": [], - "skipnewline": True + "skipnewline": True, + "need_indent": False, } self.fout = fout def newline(self): self.fout.write('\n') - self.fout.write(' ' * self.state["indent"] * 4) + self.state["need_indent"] = True def write(self, c): + if self.state["need_indent"]: + self.fout.write(' ' * self.state["indent"] * 4) + self.state["need_indent"] = False self.fout.write(c) def process_char(self, c): |