Changeset 49 for trunk/lib

Timestamp:

02/19/06 03:10:24 (6 years ago)

Author:

xi

Message:

Fix segfault under Python2.3.

Support for complex numbers.

Add /usr/local to the search path.

Location:

trunk/lib/syck

Files:

• dumpers.py (modified) (2 diffs)
• loaders.py (modified) (4 diffs)

trunk/lib/syck/dumpers.py

@@ -144 +144 @@
         return _syck.Scalar(value, tag="tag:yaml.org,2002:float")
 
+    def represent_complex(self, object):
+        if object.real != 0.0:
+            value = '%s+%sj' % (repr(object.real), repr(object.imag))
+        else:
+            value = '%sj' % repr(object.imag)
+        return _syck.Scalar(value, tag="tag:python.yaml.org,2002:complex")
+
     def represent_sets_Set(self, object):
         return _syck.Seq(list(object), tag="tag:yaml.org,2002:set")
@@ -165 +172 @@
     represent_function = represent_type
     represent_builtin_function_or_method = represent_type
+
+    def represent_module(self, object):
+        return _syck.Scalar('', tag="tag:python.yaml.org,2002:module:"+object.__name__)
 
     def represent_instance(self, object):

trunk/lib/syck/loaders.py

@@ -13 +13 @@
 
 try:
-    import sets
-except ImportError:
-    class _sets:
-        def Set(self, items):
+    Set = set
+except:
+    try:
+        from sets import Set
+    except ImportError:
+        def Set(items):
             set = {}
             for items in items:
                 set[items] = None
             return set
-    sets = _sets()
 
 import _syck
@@ -288 +289 @@
 
     def construct_set(self, node):
-        return sets.Set(node.value)
+        return Set(node.value)
 
     def construct_python_none(self, node):
@@ -304 +305 @@
     def construct_python_float(self, node):
         return float(node.value)
+
+    def construct_python_complex(self, node):
+        return complex(node.value)
 
     def construct_python_str(self, node):
@@ -359 +363 @@
         return self.find_python_object(node)
 
+    def construct_python_module(self, node):
+        module_name = node.tag.split(':')[3]
+        __import__(module_name)
+        return sys.modules[module_name]
+
     def construct_python_object(self, node):
         cls = self.find_python_object(node)