Changeset 153 for pyyaml/trunk/lib/yaml

Timestamp:

05/06/06 18:09:50 (6 years ago)

Author:

xi

Message:

Fix #11 (Thanks to edemaine(at)mit.edu).

Location:

pyyaml/trunk/lib/yaml

Files:

• __init__.py (modified) (1 diff)
• emitter.py (modified) (2 diffs)
• nodes.py (modified) (1 diff)

pyyaml/trunk/lib/yaml/__init__.py

@@ -188 +188 @@
     return dump_all([data], stream, Dumper=SafeDumper, **kwds)
 
-def add_implicit_detector(tag, regexp, first=None,
+def add_implicit_resolver(tag, regexp, first=None,
         Loader=Loader, Dumper=Dumper):
     """

pyyaml/trunk/lib/yaml/emitter.py

@@ -698 +698 @@
                 line_breaks = True
             if not (ch == u'\n' or u'\x20' <= ch <= u'\x7E'):
-                if ch < u'\x80' or ch == u'\uFEFF': # '\uFEFF' is BOM.
-                    special_characters = True
-                else:
+                if (ch == u'\x85' or u'\xA0' <= ch <= u'\uD7FF'
+                        or u'\uE000' <= ch <= u'\uFFFD') and ch != u'\uFEFF':
                     unicode_characters = True
                     if not self.allow_unicode:
                         special_characters = True
+                else:
+                    special_characters = True
 
             # Spaces, line breaks, and how they are mixed. State machine.
@@ -962 +963 @@
             if ch is None or ch in u'"\\\x85\u2028\u2029\uFEFF' \
                     or not (u'\x20' <= ch <= u'\x7E'
-                            or (self.allow_unicode and ch > u'\x7F')):
+                        or (self.allow_unicode
+                            and (u'\xA0' <= ch <= u'\uD7FF'
+                                or u'\uE000' <= ch <= u'\uFFFD'))):
                 if start < end:
                     data = text[start:end]

pyyaml/trunk/lib/yaml/nodes.py

@@ -8 +8 @@
     def __repr__(self):
         value = self.value
-        if isinstance(value, list):
-            if len(value) == 0:
-                value = '<empty>'
-            elif len(value) == 1:
-                value = '<1 item>'
-            else:
-                value = '<%d items>' % len(value)
-        else:
-            if len(value) > 75:
-                value = repr(value[:70]+u' ... ')
-            else:
-                value = repr(value)
+        #if isinstance(value, list):
+        #    if len(value) == 0:
+        #        value = '<empty>'
+        #    elif len(value) == 1:
+        #        value = '<1 item>'
+        #    else:
+        #        value = '<%d items>' % len(value)
+        #else:
+        #    if len(value) > 75:
+        #        value = repr(value[:70]+u' ... ')
+        #    else:
+        #        value = repr(value)
+        value = repr(value)
         return '%s(tag=%r, value=%s)' % (self.__class__.__name__, self.tag, value)