Changeset 119:b75de48a618c

Timestamp:

09/02/13 13:27:51 (7 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

Phase:

public

Rebase:

36323566343330333330326464383930636237313130623336306361313666623936323563613936

Message:

Support boolean and None types

Location:

nagslang

Files:

• tests/test_yamlish.py (modified) (1 diff)
• yamlish.py (modified) (4 diffs)

nagslang/tests/test_yamlish.py

@@ -80 +80 @@
         })
 
+    def test_quoted(self):
+        # a literal true is True, but 'true' is a string
+        self.roundtrip({'foo': 'true'})
+
+    def test_literals(self):
+        self.roundtrip({'foo': [True, False, None]})
+
 
 class TestFromPyYAML(TestRoundTrip):

nagslang/yamlish.py

@@ -2 +2 @@
 Serializer and dumper for a simple, YAMLish format (actually a YAML subset).
 The top level object is a dict.
-lists and dicts can contain lists, dicts, and strings.
+lists and dicts can contain:
+ * lists, dicts,
+ * single line strings,
+ * True, False, and None
 '''
 
@@ -34 +37 @@
                 f = getattr(self, '_dump_%s' % type_.__name__)
                 return f(data, indent)
+        if data in (True, False, None):
+            return self._dump_literal(data, indent)
         raise NotImplementedError()
 
@@ -59 +64 @@
 
     def _dump_basestring(self, data, indent):
+        if data in ('true', 'false', 'null'):
+            data = "'%s'" % data
         return [' ' * indent + data]
+
+    def _dump_literal(self, data, indent):
+        string = {
+            True: 'true',
+            False: 'false',
+            None: 'null',
+        }[data]
+        return [' ' * indent + string]
 
 
@@ -144 +159 @@
                 else:
                     assert self._in_list
-                    self._container.append(line)
+                    self._container.append(self._parse_value(line))
 
             if dm:
                 key, value = dm.groups()
+                assert self._in_dict
                 if value:
-                    assert self._in_dict
-                    self._container[key] = value
+                    self._container[key] = self._parse_value(value)
                 else:
                     self._parent_key = key
 
         return self._stack[0][1]
+
+    def _parse_value(self, value):
+        if value.startswith("'") and value.endswith("'"):
+            return value[1:-1]
+        if value == 'true':
+            return True
+        if value == 'false':
+            return False
+        if value == 'null':
+            return None
+        return value