Changeset 258 for pyyaml/trunk/lib/yaml/composer.py

Timestamp:

08/21/07 16:25:34 (6 years ago)

Author:

xi

Message:

Make compose() and load() ensure that the input stream contains a single document. Fixes #54.

File:

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

pyyaml/trunk/lib/yaml/composer.py

@@ -26 +26 @@
         if not self.check_event(StreamEndEvent):
             return self.compose_document()
+
+    def get_single_node(self):
+        # Drop the STREAM-START event.
+        self.get_event()
+
+        # Compose a document if the stream is not empty.
+        document = None
+        if not self.check_event(StreamEndEvent):
+            document = self.compose_document()
+
+        # Ensure that the stream contains no more documents.
+        if not self.check_event(StreamEndEvent):
+            event = self.get_event()
+            raise ComposerError("expected a single document in the stream",
+                    document.start_mark, "but found another document",
+                    event.start_mark)
+
+        # Drop the STREAM-END event.
+        self.get_event()
+
+        return document
 
     def compose_document(self):