From 88c6d5191ec98e343ebd5ca5ce980302b7ddf2f6 Mon Sep 17 00:00:00 2001 From: dota17 Date: Thu, 13 Aug 2020 17:07:32 +0800 Subject: [PATCH 1/2] Emit the correct indentation of sequence rebased and updated to current code --- lib/yaml/emitter.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/yaml/emitter.py b/lib/yaml/emitter.py index a664d0111..599c081fe 100644 --- a/lib/yaml/emitter.py +++ b/lib/yaml/emitter.py @@ -379,7 +379,7 @@ def expect_block_sequence_item(self, first=False): self.state = self.states.pop() else: self.write_indent() - self.write_indicator('-', True, indention=True) + self.write_indicator('-', True, indention=True, is_sequence=True) self.states.append(self.expect_block_sequence_item) self.expect_node(sequence=True) @@ -798,9 +798,12 @@ def write_stream_end(self): self.flush_stream() def write_indicator(self, indicator, need_whitespace, - whitespace=False, indention=False): + whitespace=False, indention=False, is_sequence=False): if self.whitespace or not need_whitespace: - data = indicator + if is_sequence: + data = ' '*(self.best_indent-2)+indicator + else: + data = indicator else: data = ' '+indicator self.whitespace = whitespace From 269e00f93a6bfed0e0c87353a879044df7df41c5 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Fri, 24 Jan 2025 19:06:33 -0500 Subject: [PATCH 2/2] more generic as other indicators might also .. --- lib/yaml/emitter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/yaml/emitter.py b/lib/yaml/emitter.py index 599c081fe..f6b0bba24 100644 --- a/lib/yaml/emitter.py +++ b/lib/yaml/emitter.py @@ -379,7 +379,7 @@ def expect_block_sequence_item(self, first=False): self.state = self.states.pop() else: self.write_indent() - self.write_indicator('-', True, indention=True, is_sequence=True) + self.write_indicator('-', True, indention=True, indent_indicator=True) self.states.append(self.expect_block_sequence_item) self.expect_node(sequence=True) @@ -798,9 +798,9 @@ def write_stream_end(self): self.flush_stream() def write_indicator(self, indicator, need_whitespace, - whitespace=False, indention=False, is_sequence=False): + whitespace=False, indention=False, indent_indicator=False): if self.whitespace or not need_whitespace: - if is_sequence: + if indent_indicator: data = ' '*(self.best_indent-2)+indicator else: data = indicator