Changeset 223 for pyyaml/trunk/lib/yaml

Timestamp:

08/13/06 09:46:20 (6 years ago)

Author:

xi

Message:

Completely rewrite the libyaml bindings.

Location:

pyyaml/trunk/lib/yaml

Files:

• __init__.py (modified) (1 diff)
• composer.py (modified) (1 diff)
• cyaml.py (added)
• resolver.py (modified) (3 diffs)

pyyaml/trunk/lib/yaml/__init__.py

@@ -8 +8 @@
 from loader import *
 from dumper import *
+
+try:
+    from cyaml import *
+except ImportError:
+    pass
 
 def scan(stream, Loader=Loader):

pyyaml/trunk/lib/yaml/composer.py

@@ -38 +38 @@
         self.get_event()
 
-        self.complete_anchors = {}
+        self.anchors = {}
         return node
 

pyyaml/trunk/lib/yaml/resolver.py

@@ -75 +75 @@
 
     def descend_resolver(self, current_node, current_index):
+        if not self.yaml_path_resolvers:
+            return
         exact_paths = {}
         prefix_paths = []
@@ -96 +98 @@
 
     def ascend_resolver(self):
+        if not self.yaml_path_resolvers:
+            return
         self.resolver_exact_paths.pop()
         self.resolver_prefix_paths.pop()
@@ -132 +136 @@
                     return tag
             implicit = implicit[1]
-        exact_paths = self.resolver_exact_paths[-1]
-        if kind in exact_paths:
-            return exact_paths[kind]
-        if None in exact_paths:
-            return exact_paths[None]
+        if self.yaml_path_resolvers:
+            exact_paths = self.resolver_exact_paths[-1]
+            if kind in exact_paths:
+                return exact_paths[kind]
+            if None in exact_paths:
+                return exact_paths[None]
         if kind is ScalarNode:
             return self.DEFAULT_SCALAR_TAG