Changeset 36 for trunk/lib/syck/dumpers.py

Timestamp:

01/29/06 17:34:38 (7 years ago)

Author:

xi

Message:

Implement new YAML<->Python string conversion (fix #42).

File:

• trunk/lib/syck/dumpers.py (modified) (2 diffs)

trunk/lib/syck/dumpers.py

@@ -109 +109 @@
 
     def represent_str(self, object):
-        return _syck.Scalar(str(object), tag="tag:yaml.org,2002:str")
+        try:
+            return _syck.Scalar(object.encode('ascii'), tag="tag:yaml.org,2002:str")
+        except UnicodeDecodeError:
+            try:
+                return _syck.Scalar(unicode(object, 'utf-8').encode('utf-8'),
+                        tag="tag:python.yaml.org,2002:str")
+            except UnicodeDecodeError:
+                return _syck.Scalar(object.encode('base64'),
+                        tag="tag:yaml.org,2002:binary")
+
+    def represent_unicode(self, object):
+        try:
+            return _syck.Scalar(object.encode('ascii'), tag="tag:python.yaml.org,2002:unicode")
+        except UnicodeEncodeError:
+            return _syck.Scalar(object.encode('utf-8'), tag="tag:yaml.org,2002:str")
 
     def represent_list(self, object):
@@ -139 +153 @@
     def represent_long(self, object):
         return _syck.Scalar(repr(object), tag="tag:python.yaml.org,2002:long")
-
-    def represent_unicode(self, object):
-        return _syck.Scalar(object.encode('utf-8'), tag="tag:python.yaml.org,2002:unicode")
 
     def represent_tuple(self, object):