Address comments from various code reviews.

1 files changed, 9 insertions, 3 deletions

diff --git a/python/google/protobuf/text_format.py b/python/google/protobuf/text_format.py
index 428e8c55..cc6ac902 100755
--- a/python/google/protobuf/text_format.py
+++ b/python/google/protobuf/text_format.py
@@ -536,12 +536,18 @@ class _Tokenizer(object):
     Raises:
       ParseError: If a byte array value couldn't be consumed.
     """
-    list = [self.ConsumeSingleByteString()]
+    list = [self._ConsumeSingleByteString()]
     while len(self.token) > 0 and self.token[0] in ('\'', '"'):
-      list.append(self.ConsumeSingleByteString())
+      list.append(self._ConsumeSingleByteString())
     return "".join(list)
 
-  def ConsumeSingleByteString(self):
+  def _ConsumeSingleByteString(self):
+    """Consume one token of a string literal.
+
+    String literals (whether bytes or text) can come in multiple adjacent
+    tokens which are automatically concatenated, like in C or Python.  This
+    method only consumes one token.
+    """
     text = self.token
     if len(text) < 1 or text[0] not in ('\'', '"'):
       raise self._ParseError('Exptected string.')