Allow for multiple function-pythonic steps in a single composition.

Author: Patrick J. McNerthney

tests/test_protobuf_messages.py

@@ -79,6 +79,7 @@ def test_message(Message):
 struct:
   a: pytest
 '''
+<<<<<<< HEAD
     assert str(m) == format(m)
     assert format(m, 'yaml') == str(m)
     assert format(m, 'json')
@@ -88,6 +89,8 @@ def test_message(Message):
     assert format(m.list_string, 'protobuf')
     assert format(m.struct, 'protobuf')
     assert format(m.list, 'protobuf')
+=======
+>>>>>>> b8a1b11 (Allow for multiple function-pythonic steps in a single composition.)
     del m.string
     del m.struct.a
     del m.list[0]
@@ -119,8 +122,11 @@ def test_message(Message):
 string: called
 struct: {}
 '''
+<<<<<<< HEAD
     m.list_string('a')
     del m.list_string[0]
+=======
+>>>>>>> b8a1b11 (Allow for multiple function-pythonic steps in a single composition.)
 
 
 def test_exceptions(Message):
@@ -150,7 +156,10 @@ def test_exceptions(Message):
         ro.map_map(nope='string')
     with pytest.raises(ValueError):
         delattr(ro.map_map, 'nope')
+<<<<<<< HEAD
     with pytest.raises(ValueError):
         ro.list_string('a')
     with pytest.raises(ValueError):
         del ro.list_string[0]
+=======
+>>>>>>> b8a1b11 (Allow for multiple function-pythonic steps in a single composition.)