Context Navigation

Changeset 57

Timestamp:

02/24/06 16:16:14 (7 years ago)

Author:

Message:

Fix a few bugs.

Location:

branches/pyyaml3000

Files:

-                      r55
+                      r57
 from error import YAMLError
 from reader import Reader
 from scanner import Scanner
 from parser import Parser
 from composer import Composer
 from resolver import Resolver
 from constructor import Constructor
+from error import *
+from reader import *
+from scanner import *
+from parser import *
+from composer import *
+from resolver import *
+from constructor import *
 from tokens import *

r55	r57
	1
	2	__all__ = ['Composer', 'ComposerError']
1	3
2	4	from error import MarkedYAMLError

-                      r56
+                      r57
+__all__ = ['BaseConstructor', 'Constructor', 'ConstructorError',
+    'YAMLObject', 'YAMLObjectMetaclass']
 from error import *
 …
         return self.construct_mapping(node)
+    def construct_undefined(self, node):
+        raise ConstructorError(None, None,
+                "could not determine a constructor for the tag %r" % node.tag.encode('utf-8'),
+                node.start_marker)
 Constructor.add_constructor(
         u'tag:yaml.org,2002:null',
 …
         u'tag:yaml.org,2002:map',
         Constructor.construct_yaml_map)
+Constructor.add_constructor(None,
+        Constructor.construct_undefined)
 class YAMLObjectMetaclass(type):

r55	r57
61	61	# flow_sequence_entry: { ALIAS ANCHOR TAG SCALAR FLOW-SEQUENCE-START FLOW-MAPPING-START KEY }
62	62	# flow_mapping_entry: { ALIAS ANCHOR TAG SCALAR FLOW-SEQUENCE-START FLOW-MAPPING-START KEY }
	63
	64	__all__ = ['Parser', 'ParserError']
63	65
64	66	from error import MarkedYAMLError

-                      r56
+                      r57
+__all__ = ['BaseResolver', 'Resolver', 'ResolverError']
+from error import MarkedYAMLError
 from nodes import *
 import re
+# Not really used.
+class ResolverError(MarkedYAMLError):
+    pass
 class BaseResolver:

-                      r55
+                      r57
 # TAG(value)
 # SCALAR(value, plain)
+#
+# Read comments in the Scanner code for more details.
+#
 __all__ = ['Scanner', 'ScannerError']

-                      r55
+                      r57
 import test_appliance
+from yaml.reader import Reader
+from yaml.scanner import Scanner
+from yaml.parser import *
+from yaml.composer import *
+from yaml.resolver import *
+from yaml.constructor import *
+from yaml.nodes import *
+from yaml import *
 class TestStructure(test_appliance.TestAppliance):
 …
         return pairs
+MyConstructor.add_constructor(None, MyConstructor.construct_scalar)
 class TestConstructor(test_appliance.TestAppliance):

Note: See TracChangeset for help on using the changeset viewer.