Changeset 188 for pyyaml/trunk/lib/yaml/reader.py

Timestamp:

06/16/06 03:23:05 (7 years ago)

Author:

xi

Message:

Fix several problems caused by ill-formed documents.

The line number is not calculated correctly for DOS-style line breaks.

Fix error reporting in remove_possible_simple_key. The problem is caused by the document:

+foo: &A bar
+*A ]

Raise an error for a complex key which is not indented correctly, for instance:

? "foo"
 : "bar"

File:

• pyyaml/trunk/lib/yaml/reader.py (modified) (1 diff)

pyyaml/trunk/lib/yaml/reader.py

@@ -140 +140 @@
             self.index += 1
             if ch in u'\n\x85\u2028\u2029'  \
-                    or (ch == u'\r' and self.buffer[self.pointer+1] != u'\n'):
+                    or (ch == u'\r' and self.buffer[self.pointer] != u'\n'):
                 self.line += 1
                 self.column = 0