aboutsummaryrefslogtreecommitdiffhomepage
path: root/python
diff options
context:
space:
mode:
authorGravatar Tres Seaver <tseaver@palladion.com>2015-01-13 15:04:41 -0500
committerGravatar Tres Seaver <tseaver@palladion.com>2015-01-13 15:04:41 -0500
commit47ee4d37c17db8e97fe5b15cf918ab56ff93bb18 (patch)
tree12aeab12f24937d637690fc95b288738a4b5d261 /python
parentd25e6686d966cd641ed5852b630c02a60f26b7fd (diff)
Use 'io.BytesIO' rather than 'cStringIO.StringIO'.
Diffstat (limited to 'python')
-rwxr-xr-xpython/google/protobuf/internal/encoder.py2
-rwxr-xr-xpython/google/protobuf/text_format.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/python/google/protobuf/internal/encoder.py b/python/google/protobuf/internal/encoder.py
index 21ed2ed7..fa22a9dd 100755
--- a/python/google/protobuf/internal/encoder.py
+++ b/python/google/protobuf/internal/encoder.py
@@ -43,7 +43,7 @@ FieldDescriptor) we construct two functions: a "sizer" and an "encoder". The
sizer takes a value of this field's type and computes its byte size. The
encoder takes a writer function and a value. It encodes the value into byte
strings and invokes the writer function to write those strings. Typically the
-writer function is the write() method of a cStringIO.
+writer function is the write() method of a BytesIO.
We try to do as much work as possible when constructing the writer and the
sizer rather than when calling them. In particular:
diff --git a/python/google/protobuf/text_format.py b/python/google/protobuf/text_format.py
index 87b5c222..c50930ef 100755
--- a/python/google/protobuf/text_format.py
+++ b/python/google/protobuf/text_format.py
@@ -34,7 +34,7 @@
__author__ = 'kenton@google.com (Kenton Varda)'
-import cStringIO
+import io
import re
import six
@@ -89,7 +89,7 @@ def MessageToString(message, as_utf8=False, as_one_line=False,
Returns:
A string of the text formatted protocol buffer message.
"""
- out = cStringIO.StringIO()
+ out = io.BytesIO()
PrintMessage(message, out, as_utf8=as_utf8, as_one_line=as_one_line,
pointy_brackets=pointy_brackets,
use_index_order=use_index_order,