Changeset 233

Timestamp:

09/12/06 09:53:30 (2 years ago)

Author:

xi

Message:

Fix loading an empty YAML stream.

Files:

• pyyaml/trunk/ext/_yaml.pyx (modified) (2 diffs)
• pyyaml/trunk/lib/yaml/composer.py (modified) (2 diffs)
• pyyaml/trunk/tests/data/empty-document-bug.canonical (added)
• pyyaml/trunk/tests/data/empty-document-bug.data (added)

pyyaml/trunk/ext/_yaml.pyx

@@ -652 +652 @@
-    def check_node(self):
-        self._parse_next_event()
+        if self.parsed_event.type == YAML_STREAM_START_EVENT:
+            yaml_event_delete(&self.parsed_event)
+            self._parse_next_event()
-        if self.parsed_event.type != YAML_STREAM_END_EVENT:
-            return True
@@ -662 +665 @@
-
-    cdef object _compose_document(self):
-        if self.parsed_event.type == YAML_STREAM_START_EVENT:
-            yaml_event_delete(&self.parsed_event)
-            self._parse_next_event()
-        yaml_event_delete(&self.parsed_event)
-        node = self._compose_node(None, None)

pyyaml/trunk/lib/yaml/composer.py

@@ -15 +15 @@
-
-    def check_node(self):
+        # Drop the STREAM-START event.
+        if self.check_event(StreamStartEvent):
+            self.get_event()
+
-        # If there are more documents available?
-        return not self.check_event(StreamEndEvent)
@@ -24 +28 @@
-
-    def compose_document(self):
-
-        # Drop the STREAM-START event.
-        if self.check_event(StreamStartEvent):
-            self.get_event()
-
-        # Drop the DOCUMENT-START event.
-        self.get_event()