Mercurial Repositories > eric / file diff

diff -r e52318f11812 -r ff666d8230f7 Cooperation/Connection.py
--- a/Cooperation/Connection.py	Wed Jul 22 19:45:39 2015 +0200
+++ b/Cooperation/Connection.py	Thu Jul 23 20:14:30 2015 +0200
@@ -140,7 +140,8 @@
         
         msg = QByteArray(message.encode("utf-8"))
         data = QByteArray("{0}{1}{2}{1}".format(
-            Connection.ProtocolMessage, SeparatorToken, msg.size())) + msg
+            Connection.ProtocolMessage, SeparatorToken, msg.size())
+            .encode()) + msg
         return self.write(data) == data.size()
     
     def timerEvent(self, evt):
@@ -266,8 +267,8 @@
         """
         greeting = QByteArray(self.__greetingMessage.encode("utf-8"))
         data = QByteArray("{0}{1}{2}{1}".format(
-            Connection.ProtocolGreeting, SeparatorToken, greeting.size())) + \
-            greeting
+            Connection.ProtocolGreeting, SeparatorToken, greeting.size())
+            .encode()) + greeting
         if self.write(data) == data.size():
             self.__isGreetingMessageSent = True
     
@@ -427,7 +428,8 @@
             message = "<empty>"
         msg = QByteArray(message.encode("utf-8"))
         data = QByteArray("{0}{1}{2}{1}".format(
-            Connection.ProtocolParticipants, SeparatorToken, msg.size())) + msg
+            Connection.ProtocolParticipants, SeparatorToken, msg.size())
+            .encode()) + msg
         self.write(data)
     
     def sendEditorCommand(self, projectHash, filename, message):
@@ -442,7 +444,8 @@
         msg = QByteArray("{0}{1}{2}{1}{3}".format(
             projectHash, SeparatorToken, filename, message).encode("utf-8"))
         data = QByteArray("{0}{1}{2}{1}".format(
-            Connection.ProtocolEditor, SeparatorToken, msg.size())) + msg
+            Connection.ProtocolEditor, SeparatorToken, msg.size())
+            .encode()) + msg
         self.write(data)
     
     def __disconnected(self):