commit 397bd51af7cfad17a93324f0c43f8d3424627b36
author Nobuaki Sukegawa <nsuke@apache.org> Wed Jan 06 14:43:15 2016 +0900
committer Nobuaki Sukegawa <nsukeg@gmail.com> Mon Jan 11 11:35:10 2016 +0900
tree 2c541eae3740127f507e4a269525f8add6a9c403
parent 03565bf467de14a8a229d419164c2b16c34c538e

THRIFT-3527 -gen py:dynamic,utf8strings ignores utf8strings option

This closes #777

lib/py/src/protocol/TProtocol.py

diff --git a/lib/py/src/protocol/TProtocol.py b/lib/py/src/protocol/TProtocol.py
index 9679ba0..450e0fa 100644
--- a/lib/py/src/protocol/TProtocol.py
+++ b/lib/py/src/protocol/TProtocol.py
@@ -111,6 +111,9 @@
   def writeBinary(self, str_val):
     pass
 
+  def writeUtf8(self, str_val):
+    self.writeString(str_val.encode('utf8'))
+
   def readMessageBegin(self):
     pass
 
@@ -171,6 +174,9 @@
   def readBinary(self):
     pass
 
+  def readUtf8(self):
+    return self.readString().decode('utf8')
+
   def skip(self, ttype):
     if ttype == TType.STOP:
       return
@@ -242,6 +248,11 @@
         raise TProtocolException(type=TProtocolException.INVALID_DATA,
                                  message='Invalid binary field type %d' % ttype)
       return ('readBinary', 'writeBinary', False)
+    if sys.version_info[0] == 2 and spec == 'UTF8':
+      if ttype != TType.STRING:
+        raise TProtocolException(type=TProtocolException.INVALID_DATA,
+                                 message='Invalid string field type %d' % ttype)
+      return ('readUtf8', 'writeUtf8', False)
     return self._TTYPE_HANDLERS[ttype] if ttype < len(self._TTYPE_HANDLERS) else (None, None, False)
 
   def _read_by_ttype(self, ttype, spec, espec):