Changeset 137 for pyyaml/trunk/lib/yaml/__init__.py

Timestamp:

04/16/06 19:45:21 (7 years ago)

Author:

xi

Message:

Refactor resolver.

File:

• pyyaml/trunk/lib/yaml/__init__.py (modified) (5 diffs)

pyyaml/trunk/lib/yaml/__init__.py

@@ -12 +12 @@
 from representer import *
 
-from detector import *
+from resolver import *
 
 from tokens import *
@@ -197 +197 @@
     return dump_all([data], stream, Dumper=SafeDumper, **kwds)
 
-def add_detector(tag, regexp, first=None, Loader=Loader, Dumper=Dumper):
+def add_implicit_detector(tag, regexp, first=None,
+        Loader=Loader, Dumper=Dumper):
     """
     Add an implicit scalar detector.
@@ -204 +205 @@
     first is a sequence of possible initial characters or None.
     """
-    Loader.add_detector(tag, regexp, first)
-    Dumper.add_detector(tag, regexp, first)
-
-def add_resolver(tag, path, Loader=Loader):
+    Loader.add_implicit_resolver(tag, regexp, first)
+    Dumper.add_implicit_resolver(tag, regexp, first)
+
+def add_path_resolver(tag, path, kind=None, Loader=Loader, Dumper=Dumper):
     """
     Add a path based resolver for the given tag.
@@ -214 +215 @@
     Keys can be string values, integers, or None.
     """
-    Loader.add_resolver(tag, path)
+    Loader.add_path_resolver(tag, path, kind)
+    Dumper.add_path_resolver(tag, path, kind)
 
 def add_constructor(tag, constructor, Loader=Loader):
@@ -232 +234 @@
     """
     Loader.add_multi_constructor(tag_prefix, multi_constructor)
+
+def add_representer(data_type, representer, Dumper=Dumper):
+    """
+    Add a representer for the given type.
+    Representer is a function accepting a Dumper instance
+    and an instance of the given data type
+    and producing the corresponding representation node.
+    """
+    Dumper.add_representer(data_type, representer)
 
 class YAMLObjectMetaclass(type):