diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-14 11:50:31 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-14 11:50:31 -0800 |
commit | f157a5651c79a7a36e242af216a5d5b383ba8af2 (patch) | |
tree | 368bb0ca0e89ab7514302e4df00435a4ef461a28 /python/google | |
parent | faf581d20866ad5e586b3e515f6c547d2dcec2c1 (diff) | |
download | protobuf-f157a5651c79a7a36e242af216a5d5b383ba8af2.tar.gz protobuf-f157a5651c79a7a36e242af216a5d5b383ba8af2.tar.bz2 protobuf-f157a5651c79a7a36e242af216a5d5b383ba8af2.zip |
Down-integrate from internal code base (C++ maps support).
Diffstat (limited to 'python/google')
-rwxr-xr-x | python/google/protobuf/internal/generator_test.py | 2 | ||||
-rw-r--r-- | python/google/protobuf/internal/test_bad_identifiers.proto | 6 | ||||
-rwxr-xr-x | python/google/protobuf/text_format.py | 36 |
3 files changed, 20 insertions, 24 deletions
diff --git a/python/google/protobuf/internal/generator_test.py b/python/google/protobuf/internal/generator_test.py index 303d3e03..03361e66 100755 --- a/python/google/protobuf/internal/generator_test.py +++ b/python/google/protobuf/internal/generator_test.py @@ -281,8 +281,6 @@ class GeneratorTest(basetest.TestCase): "baz") self.assertEqual(message.Extensions[test_bad_identifiers_pb2.service], "qux") - self.assertEqual(message.Extensions[test_bad_identifiers_pb2.class_], - "Foo") def testOneof(self): desc = unittest_pb2.TestAllTypes.DESCRIPTOR diff --git a/python/google/protobuf/internal/test_bad_identifiers.proto b/python/google/protobuf/internal/test_bad_identifiers.proto index 29fa38a2..c4860ea8 100644 --- a/python/google/protobuf/internal/test_bad_identifiers.proto +++ b/python/google/protobuf/internal/test_bad_identifiers.proto @@ -40,15 +40,13 @@ message TestBadIdentifiers { extensions 100 to max; } +// Make sure these reasonable extension names don't conflict with internal +// variables. extend TestBadIdentifiers { - // Make sure these reasonable extension names don't conflict with internal - // variables. optional string message = 100 [default="foo"]; optional string descriptor = 101 [default="bar"]; optional string reflection = 102 [default="baz"]; optional string service = 103 [default="qux"]; - // And Python keywords. - optional string class = 104 [default="Foo"]; } message AnotherMessage {} diff --git a/python/google/protobuf/text_format.py b/python/google/protobuf/text_format.py index b2f3d32c..2cad699c 100755 --- a/python/google/protobuf/text_format.py +++ b/python/google/protobuf/text_format.py @@ -217,24 +217,6 @@ def PrintFieldValue(field, value, out, indent=0, as_utf8=False, out.write(str(value)) -def _ParseOrMerge(lines, message, allow_multiple_scalars): - """Converts an ASCII representation of a protocol message into a message. - - Args: - lines: Lines of a message's ASCII representation. - message: A protocol buffer message to merge into. - allow_multiple_scalars: Determines if repeated values for a non-repeated - field are permitted, e.g., the string "foo: 1 foo: 2" for a - required/optional field named "foo". - - Raises: - ParseError: On ASCII parsing problems. - """ - tokenizer = _Tokenizer(lines) - while not tokenizer.AtEnd(): - _MergeField(tokenizer, message, allow_multiple_scalars) - - def Parse(text, message): """Parses an ASCII representation of a protocol message into a message. @@ -305,6 +287,24 @@ def MergeLines(lines, message): return message +def _ParseOrMerge(lines, message, allow_multiple_scalars): + """Converts an ASCII representation of a protocol message into a message. + + Args: + lines: Lines of a message's ASCII representation. + message: A protocol buffer message to merge into. + allow_multiple_scalars: Determines if repeated values for a non-repeated + field are permitted, e.g., the string "foo: 1 foo: 2" for a + required/optional field named "foo". + + Raises: + ParseError: On ASCII parsing problems. + """ + tokenizer = _Tokenizer(lines) + while not tokenizer.AtEnd(): + _MergeField(tokenizer, message, allow_multiple_scalars) + + def _MergeField(tokenizer, message, allow_multiple_scalars): """Merges a single protocol message field into a message. |