Changeset 103:adf3cd83bf7a for nagslang

Timestamp:

09/02/13 11:05:25 (9 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

Phase:

public

Rebase:

38323238613265633737366534633963326263633366393564373333653762656537363239643735

Message:

Support a common stylistic variation

Location:

nagslang

Files:

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

nagslang/tests/test_yamlish.py

@@ -8 +8 @@
 
 from nagslang.yamlish import load, dump
+
+
+class TestParse(TestCase):
+    def assertParsesAs(self, yaml, expected):
+        f = StringIO(yaml.strip())
+        self.assertEqual(load(f), expected)
+
+    def test_dict_list_1(self):
+        self.assertParsesAs('''
+foo:
+- bar
+- baz
+        ''', {'foo': ['bar', 'baz']})
+
+    def test_dict_list_2(self):
+        self.assertParsesAs('''
+foo:
+  - bar
+  - baz
+        ''', {'foo': ['bar', 'baz']})
 
 

nagslang/yamlish.py

@@ -64 +64 @@
 
         if len(spaces) > indent():
-            # Nested dict
-            assert dm
             assert parent_key
-            stack.append((len(spaces), {}))
+            if dm:
+                # Nested dict
+                stack.append((len(spaces), {}))
+            elif lm:
+                # Over-indented list in a dict
+                stack.append((len(spaces), []))
             stack[-2][1][parent_key] = obj()
             parent_key = None