Changeset 138:366b334a7018 for nagslang

Timestamp:

09/02/13 16:12:42 (8 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

Phase:

public

Rebase:

66656437653561326434663063336136316639326530643531646165636435346662656261303831

Message:

Render tuples to lists

Location:

nagslang

Files:

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

nagslang/tests/test_yamlish.py

@@ -35 +35 @@
 
 class TestRoundTrip(TestCase):
+    from_pyyaml = False
+
     def roundtrip(self, data):
         text = self.dump_s(data)
@@ -107 +109 @@
         })
 
+    def test_tuples(self):
+        if self.from_pyyaml:
+            raise SkipTest("Can't parse PyYAML tuples")
+        orig = {
+            'polygons': {
+                1: [
+                    (0, 1),
+                    (2, 3),
+                ],
+            },
+        }
+        text = self.dump_s(orig)
+        result = self.load_s(text)
+        self.assertEqual(orig['polygons'][1][0],
+                         tuple(result['polygons'][1][0]))
+        self.assertEqual(orig['polygons'][1][1],
+                         tuple(result['polygons'][1][1]))
+
     def test_quoted(self):
         # a literal true is True, but 'true' is a string
@@ -122 +142 @@
 
 class TestFromPyYAML(TestRoundTrip):
+    from_pyyaml = True
+
     def dump_s(self, data):
         if yaml is None:
@@ -129 +151 @@
 
 class TestFromPyYAMLInlineLists(TestRoundTrip):
+    from_pyyaml = True
+
     def dump_s(self, data):
         if yaml is None:

nagslang/yamlish.py

@@ -35 +35 @@
 
     def _dump_block(self, data, indent=0):
-        for type_ in (list, dict):
+        for type_ in (list, tuple, dict):
             if isinstance(data, type_):
                 f = getattr(self, '_dump_%s_block' % type_.__name__)
@@ -42 +42 @@
 
     def _dump_inline(self, data):
-        if data in (True, False, None):
+        if data is True or data is False or data is None:
             return self._dump_literal(data)
-        for type_ in (list, dict, basestring, int, float):
+        for type_ in (list, tuple, dict, basestring, int, float):
             if isinstance(data, type_):
                 f = getattr(self, '_dump_%s' % type_.__name__)
@@ -61 +61 @@
                 output += dumped
         return output
+
+    _dump_tuple_block = _dump_list_block
 
     def _dump_dict_block(self, data, indent):
@@ -77 +79 @@
 
     def _inlineable(self, data):
-        if isinstance(data, list):
-            return all(not isinstance(item, (list, dict)) for item in data)
+        if isinstance(data, (list, tuple)):
+            return all(not isinstance(item, (list, dict, tuple))
+                       for item in data)
         elif isinstance(data, dict):
-            return all(not isinstance(item, (list, dict))
+            return all(not isinstance(item, (list, dict, tuple))
                        for item in data.itervalues())
         else:
@@ -88 +91 @@
         return '[%s]' % ', '.join(self._dump_inline(item) for item in data)
 
+    _dump_tuple = _dump_list
+
     def _dump_dict(self, data):
         return '{%s}' % ', '.join(
-                '%s: %s' % (self._dump_inline(key), self._dump_inline(value))
-                for key, value in data.iteritems())
+            '%s: %s' % (self._dump_inline(key), self._dump_inline(value))
+            for key, value in data.iteritems())
 
     def _dump_basestring(self, data):