Changeset 258 for pyyaml/trunk/lib

Timestamp:

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

Author:

xi

Message:

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

Location:

pyyaml/trunk/lib/yaml

Files:

• __init__.py (modified) (4 diffs)
• composer.py (modified) (1 diff)
• constructor.py (modified) (1 diff)

pyyaml/trunk/lib/yaml/__init__.py

@@ -36 +36 @@
     """
     loader = Loader(stream)
-    if loader.check_node():
-        return loader.get_node()
+    return loader.get_single_node()
 
 def compose_all(stream, Loader=Loader):
@@ -48 +47 @@
         yield loader.get_node()
 
+def load(stream, Loader=Loader):
+    """
+    Parse the first YAML document in a stream
+    and produce the corresponding Python object.
+    """
+    loader = Loader(stream)
+    return loader.get_single_data()
+
 def load_all(stream, Loader=Loader):
     """
@@ -57 +64 @@
         yield loader.get_data()
 
-def load(stream, Loader=Loader):
+def safe_load(stream):
     """
     Parse the first YAML document in a stream
     and produce the corresponding Python object.
-    """
-    loader = Loader(stream)
-    if loader.check_data():
-        return loader.get_data()
+    Resolve only basic YAML tags.
+    """
+    return load(stream, SafeLoader)
 
 def safe_load_all(stream):
@@ -73 +79 @@
     """
     return load_all(stream, SafeLoader)
-
-def safe_load(stream):
-    """
-    Parse the first YAML document in a stream
-    and produce the corresponding Python object.
-    Resolve only basic YAML tags.
-    """
-    return load(stream, SafeLoader)
 
 def emit(events, stream=None, Dumper=Dumper,

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):

pyyaml/trunk/lib/yaml/constructor.py

@@ -37 +37 @@
         if self.check_node():
             return self.construct_document(self.get_node())
+
+    def get_single_data(self):
+        # Ensure that the stream contains a single document and construct it.
+        node = self.get_single_node()
+        if node is not None:
+            return self.construct_document(node)
+        return None
 
     def construct_document(self, node):