Mercurial Repositories > eric / changeset

--- 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):

--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Wed Jul 22 19:45:39 2015 +0200
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Thu Jul 23 20:14:30 2015 +0200
@@ -118,7 +118,8 @@
             urlQuery = QUrlQuery(url)
             self.__title = urlQuery.queryItemValue("title")
             self.__enabled = urlQuery.queryItemValue("enabled") != "false"
-            self.__location = QByteArray(urlQuery.queryItemValue("location").encode())
+            self.__location = QByteArray(urlQuery.queryItemValue("location")
+                .encode())
             
             # Check for required subscription
             self.__requiresLocation = urlQuery.queryItemValue(
@@ -139,7 +140,7 @@
             self.__enabled = QUrl.fromPercentEncoding(
                 url.encodedQueryItemValue("enabled")) != "false"
             self.__location = QByteArray(QUrl.fromPercentEncoding(
-                url.encodedQueryItemValue("location")))
+                url.encodedQueryItemValue("location")).encode())
             
             # Check for required subscription
             self.__requiresLocation = QUrl.fromPercentEncoding(

--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Wed Jul 22 19:45:39 2015 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Thu Jul 23 20:14:30 2015 +0200
@@ -206,7 +206,7 @@
             return QUrl()
         
         ret = QUrl.fromEncoded(QByteArray(self.parseTemplate(
-            searchTerm, self._suggestionsUrlTemplate)))
+            searchTerm, self._suggestionsUrlTemplate).encode()))
         
         if self.__searchMethod != "post":
             if qVersion() >= "5.0.0":

--- a/Helpviewer/Passwords/PasswordManager.py	Wed Jul 22 19:45:39 2015 +0200
+++ b/Helpviewer/Passwords/PasswordManager.py	Thu Jul 23 20:14:30 2015 +0200
@@ -469,12 +469,13 @@
             if qVersion() >= "5.0.0":
                 from PyQt5.QtCore import QUrlQuery
                 argsUrl = QUrl.fromEncoded(
-                    QByteArray("foo://bar.com/?" + QUrl.fromPercentEncoding(
-                        data.replace(b"+", b"%20"))))
+                    QByteArray(b"foo://bar.com/?" + QUrl.fromPercentEncoding(
+                        data.replace(b"+", b"%20")).encode()))
                 encodedArgs = QUrlQuery(argsUrl).queryItems()
             else:
                 argsUrl = QUrl.fromEncoded(
-                    QByteArray("foo://bar.com/?" + data.replace(b"+", b"%20")))
+                    QByteArray(b"foo://bar.com/?" + data.replace(b"+", b"%20"))
+                )
                 encodedArgs = argsUrl.queryItems()
             args = set()
             for arg in encodedArgs:

--- a/Project/CreateDialogCodeDialog.py	Wed Jul 22 19:45:39 2015 +0200
+++ b/Project/CreateDialogCodeDialog.py	Thu Jul 23 20:14:30 2015 +0200
@@ -293,7 +293,8 @@
                             for index in range(len(parameterNames)):
                                 if not parameterNames[index]:
                                     parameterNames[index] = \
-                                        QByteArray("p{0:d}".format(index))
+                                        QByteArray("p{0:d}".format(index)
+                                            .encode())
                         methNamesSig = \
                             ", ".join(
                                 [bytes(n).decode() for n in parameterNames])