chore: rebase changes from PR #20 after modernizing 'master'

@ctheune PTAL -- this seems to cause a hang for me in the tests.

Author: tseaver

peppercorn/__init__.py

@@ -32,7 +32,7 @@ def __init__(self):
         super().__init__("Not enough end markers")
 
 
-def parse(tokens):
+def parse(tokens, unique_key_separator=None):
     """ Infer a data structure from the ordered set of fields and
     return it."""
     target = typ = None
@@ -41,14 +41,21 @@ def parse(tokens):
 
     for token in tokens:
         key, val = token
+
+        if unique_key_separator:
+            key = key.rsplit(unique_key_separator, maxsplit=1)[0]
+
         if key == START:
             stack.append((target, typ, out))
             target, typ = data_type(val)
+
             if typ in TYPS:
                 out = []
             else:
                 raise UnknownStartMarker(token)
+
         elif key == END:
+
             if typ == SEQUENCE:
                 parsed = [v for (k, v) in out]
             elif typ == MAPPING:
@@ -59,13 +66,15 @@ def parse(tokens):
                 parsed = None
             else:
                 raise TooManyEndMarkers()
+
             prev_target, prev_typ, out = stack.pop()
             if parsed is not None:
                 out.append((target, parsed))
             target = prev_target
             typ = prev_typ
+
         else:
-            out.append(token)
+            out.append((key, val))
 
     if stack:
         raise NotEnoughEndMarkers()

peppercorn/tests.py

@@ -248,3 +248,50 @@ def test_insufficient_end_markers():
 
     with pytest.raises(NotEnoughEndMarkers):
         parse(iem_fields)
+
+
+def test_bare_with_marker(fields):
+    from peppercorn import parse
+
+    i = 0
+    def next_id():
+        nonlocal i
+        i += 1
+        return str(i)
+
+    fields_with_marker = [
+        (key + ":" + next_id(), value)
+        for key, value in fields
+    ]
+
+    result = parse(fields_with_marker, unique_key_separator=":")
+
+    _assertFieldsResult(result)
+
+
+def test_bare_without_marker(fields):
+    # This is proof that ":" isn't something special when we don't
+    # provide a unique key separator
+    from peppercorn import START, END
+    from peppercorn import parse
+
+    fields_wo_marker = []
+
+    for key, value in fields:
+        if key not in [START, END]:
+            key = key + ":something"
+        fields.append((key, value))
+
+    result = self._callFUT(fields_wo_marker)
+
+    assert result == {
+        'series': {
+            'name:something':'date series 1',
+            'dates': [
+                ['10', '12', '2008'],
+                ['10', '12', '2009'],
+            ],
+        },
+        'name:something': 'project1',
+        'title:something': 'Cool project',
+    }