Changeset 304 for pyyaml/trunk/lib

Timestamp:

12/04/08 06:32:12 (3 years ago)

Author:

xi

Message:

Fixed a problem with emitting block scalars (thanks to Andrey Somov): no longer emit indentation spaces when they are not needed; emit the correct number of leading breaks for folded scalars; emit the '+' chomping indicator for a single break scalar.

Files:

• pyyaml/trunk/lib/yaml/emitter.py (modified) (3 diffs)

pyyaml/trunk/lib/yaml/emitter.py

@@ -1010 +1010 @@
     def determine_block_hints(self, text):
         hints = u''
-        if text and text[0] in u' \n\x85\u2028\u2029':
-            hints += unicode(self.best_indent)
-        tail = text[-2:]
-        while len(tail) < 2:
-            tail = u' '+tail
-        if tail[-1] in u'\n\x85\u2028\u2029':
-            if tail[-2] in u'\n\x85\u2028\u2029':
+        if text:
+            if text[0] in u' \n\x85\u2028\u2029':
+                hints += unicode(self.best_indent)
+            if text[-1] not in u'\n\x85\u2028\u2029':
+                hints += u'-'
+            elif len(text) == 1 or text[-2] in u'\n\x85\u2028\u2029':
                 hints += u'+'
-        else:
-            hints += u'-'
         return hints
 
@@ -1025 +1022 @@
         hints = self.determine_block_hints(text)
         self.write_indicator(u'>'+hints, True)
-        self.write_indent()
-        leading_space = False
+        self.write_line_break()
+        leading_space = True
         spaces = False
-        breaks = False
+        breaks = True
         start = end = 0
         while end <= len(text):
@@ -1076 +1073 @@
         chomp = self.determine_block_hints(text)
         self.write_indicator(u'|'+chomp, True)
-        self.write_indent()
-        breaks = False
+        self.write_line_break()
+        breaks = True
         start = end = 0
         while end <= len(text):