Matched text format for maps.

python/pb_unit_tests/text_format_test_wrapper.py

@@ -29,7 +29,6 @@ from google.protobuf.internal import _parameterized
 
 sep = _parameterized._SEPARATOR
 
-text_format_test.OnlyWorksWithProto2RightNowTests.testPrintMapUsingCppImplementation.__unittest_expecting_failure__ = True
 text_format_test.OnlyWorksWithProto2RightNowTests.testPrintUnknownFields.__unittest_expecting_failure__ = True
 getattr(text_format_test.TextFormatMessageToStringTests, "testPrintUnknownFieldsEmbeddedMessageInBytes" + sep + "0").__unittest_expecting_failure__ = True
 getattr(text_format_test.TextFormatMessageToStringTests, "testPrintUnknownFieldsEmbeddedMessageInBytes" + sep + "1").__unittest_expecting_failure__ = True

upb/text_encode.c

@@ -230,7 +230,7 @@ static void txtenc_mapentry(txtenc *e, upb_msgval key, upb_msgval val,
   const upb_fielddef *key_f = upb_msgdef_field(entry, 0);
   const upb_fielddef *val_f = upb_msgdef_field(entry, 1);
   txtenc_indent(e);
-  txtenc_printf(e, "%s: {", upb_fielddef_name(f));
+  txtenc_printf(e, "%s {", upb_fielddef_name(f));
   txtenc_endfield(e);
   e->indent_depth++;