commit 95870f06cdee04b9ec8a263f8c71597a3b95678a
author antbofh <antbofh@gmail.com> Fri Jun 21 22:33:55 2019 +0300
committer James E. King III <jking@apache.org> Fri Jun 21 15:33:55 2019 -0400
tree ec66c96b181290e1568e5cbb4050ad72420356da
parent a85d532bb397ecfab59afa079da1fe776548af08

THRIFT-4892: fixed data type conflict with simultaneous usage of bytes and str (#1804)

lib/py/src/transport/TTransport.py

diff --git a/lib/py/src/transport/TTransport.py b/lib/py/src/transport/TTransport.py
index d13060f..8573ba7 100644
--- a/lib/py/src/transport/TTransport.py
+++ b/lib/py/src/transport/TTransport.py
@@ -376,7 +376,7 @@
         if not self.transport.isOpen():
             self.transport.open()
 
-        self.send_sasl_msg(self.START, self.sasl.mechanism)
+        self.send_sasl_msg(self.START, bytes(self.sasl.mechanism, 'ascii'))
         self.send_sasl_msg(self.OK, self.sasl.process())
 
         while True:
@@ -417,7 +417,7 @@
     def flush(self):
         data = self.__wbuf.getvalue()
         encoded = self.sasl.wrap(data)
-        self.transport.write(''.join((pack("!i", len(encoded)), encoded)))
+        self.transport.write(pack("!i", len(encoded)) + encoded)
         self.transport.flush()
         self.__wbuf = BufferIO()