Changeset 135 for pyyaml/trunk/lib/yaml/representer.py

Timestamp:

04/12/06 18:26:41 (7 years ago)

Author:

xi

Message:

Fix allow_unicode (ticket:3).

File:

• pyyaml/trunk/lib/yaml/representer.py (modified) (1 diff)

pyyaml/trunk/lib/yaml/representer.py

@@ -120 +120 @@
 
     def represent_str(self, native):
+        encoding = None
         try:
-            native.encode('ascii')
-            ascii = True
-        except (UnicodeDecodeError, UnicodeEncodeError):
-            ascii = False
-        if ascii:
+            unicode(native, 'ascii')
+            encoding = 'ascii'
+        except UnicodeDecodeError:
+            try:
+                unicode(native, 'utf-8')
+                encoding = 'utf-8'
+            except UnicodeDecodeError:
+                pass
+        if encoding:
             return self.represent_scalar(u'tag:yaml.org,2002:str',
-                    unicode(native, 'ascii'))
+                    unicode(native, encoding))
         else:
             return self.represent_scalar(u'tag:yaml.org,2002:binary',