Mercurial Repositories > eric / changeset
changeset
Changed code to make eric compatible to PyQt 5.5 (QByteArry issue).
Sat, 25 Jul 2015 13:02:39 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 25 Jul 2015 13:02:39 +0200
- changeset 4331
- 711e7c35a49b
- parent 4327
- ff666d8230f7
- child 4332
- 64034d85c709
Changed code to make eric compatible to PyQt 5.5 (QByteArry issue).
--- a/Cooperation/Connection.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Cooperation/Connection.py Sat Jul 25 13:02:39 2015 +0200 @@ -141,7 +141,7 @@ msg = QByteArray(message.encode("utf-8")) data = QByteArray("{0}{1}{2}{1}".format( Connection.ProtocolMessage, SeparatorToken, msg.size()) - .encode()) + msg + .encode("utf-8")) + msg return self.write(data) == data.size() def timerEvent(self, evt): @@ -268,7 +268,7 @@ greeting = QByteArray(self.__greetingMessage.encode("utf-8")) data = QByteArray("{0}{1}{2}{1}".format( Connection.ProtocolGreeting, SeparatorToken, greeting.size()) - .encode()) + greeting + .encode("utf-8")) + greeting if self.write(data) == data.size(): self.__isGreetingMessageSent = True @@ -429,7 +429,7 @@ msg = QByteArray(message.encode("utf-8")) data = QByteArray("{0}{1}{2}{1}".format( Connection.ProtocolParticipants, SeparatorToken, msg.size()) - .encode()) + msg + .encode("utf-8")) + msg self.write(data) def sendEditorCommand(self, projectHash, filename, message): @@ -445,7 +445,7 @@ projectHash, SeparatorToken, filename, message).encode("utf-8")) data = QByteArray("{0}{1}{2}{1}".format( Connection.ProtocolEditor, SeparatorToken, msg.size()) - .encode()) + msg + .encode("utf-8")) + msg self.write(data) def __disconnected(self):
--- a/E5Gui/E5ToolBarManager.py Thu Jul 23 20:14:30 2015 +0200 +++ b/E5Gui/E5ToolBarManager.py Sat Jul 25 13:02:39 2015 +0200 @@ -479,18 +479,18 @@ for tbID in self.__defaultToolBars: tb = self.__allToolBars[tbID] if tb.objectName(): - stream.writeString(tb.objectName().encode()) + stream.writeString(tb.objectName().encode("utf-8")) else: - stream.writeString(tb.windowTitle().encode()) + stream.writeString(tb.windowTitle().encode("utf-8")) stream.writeUInt16(len(self.__toolBars[tbID])) for action in self.__toolBars[tbID]: if action is not None: if action.objectName(): - stream.writeString(action.objectName().encode()) + stream.writeString(action.objectName().encode("utf-8")) else: - stream.writeString(action.text().encode()) + stream.writeString(action.text().encode("utf-8")) else: - stream.writeString("".encode()) + stream.writeString("".encode("utf-8")) # save the custom toolbars stream.writeUInt16(E5ToolBarManager.CustomToolBarMarker) @@ -498,17 +498,17 @@ for tbID in self.__toolBars: if tbID not in self.__defaultToolBars: tb = self.__allToolBars[tbID] - stream.writeString(tb.objectName().encode()) - stream.writeString(tb.windowTitle().encode()) + stream.writeString(tb.objectName().encode("utf-8")) + stream.writeString(tb.windowTitle().encode("utf-8")) stream.writeUInt16(len(self.__toolBars[tbID])) for action in self.__toolBars[tbID]: if action is not None: if action.objectName(): - stream.writeString(action.objectName().encode()) + stream.writeString(action.objectName().encode("utf-8")) else: - stream.writeString(action.text().encode()) + stream.writeString(action.text().encode("utf-8")) else: - stream.writeString("".encode()) + stream.writeString("".encode("utf-8")) return data
--- a/Helpviewer/AdBlock/AdBlockManager.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/AdBlock/AdBlockManager.py Sat Jul 25 13:02:39 2015 +0200 @@ -298,7 +298,7 @@ subscriptions = [self.__defaultSubscriptionUrlString, self.__customSubscriptionUrlString] for subscription in subscriptions: - url = QUrl.fromEncoded(subscription.encode()) + url = QUrl.fromEncoded(subscription.encode("utf-8")) adBlockSubscription = AdBlockSubscription( url, subscription.startswith(self.__customSubscriptionUrlString), @@ -327,7 +327,7 @@ return # Step 2: if it is not, get it - url = QUrl.fromEncoded(urlString.encode()) + url = QUrl.fromEncoded(urlString.encode("utf-8")) adBlockSubscription = AdBlockSubscription(url, False, self) self.addSubscription(adBlockSubscription) self.requiredSubscriptionLoaded.emit(adBlockSubscription)
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Sat Jul 25 13:02:39 2015 +0200 @@ -119,7 +119,7 @@ self.__title = urlQuery.queryItemValue("title") self.__enabled = urlQuery.queryItemValue("enabled") != "false" self.__location = QByteArray(urlQuery.queryItemValue("location") - .encode()) + .encode("utf-8")) # Check for required subscription self.__requiresLocation = urlQuery.queryItemValue( @@ -140,7 +140,7 @@ self.__enabled = QUrl.fromPercentEncoding( url.encodedQueryItemValue("enabled")) != "false" self.__location = QByteArray(QUrl.fromPercentEncoding( - url.encodedQueryItemValue("location")).encode()) + url.encodedQueryItemValue("location")).encode("utf-8")) # Check for required subscription self.__requiresLocation = QUrl.fromPercentEncoding(
--- a/Helpviewer/HelpLanguagesDialog.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/HelpLanguagesDialog.py Sat Jul 25 13:02:39 2015 +0200 @@ -143,7 +143,7 @@ if qvalue > 0.1: qvalue -= 0.1 - return QByteArray(", ".join(processed).encode()) + return QByteArray(", ".join(processed).encode("utf-8")) @classmethod def defaultAcceptLanguages(cls):
--- a/Helpviewer/HelpTabWidget.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/HelpTabWidget.py Sat Jul 25 13:02:39 2015 +0200 @@ -917,7 +917,7 @@ return url urlString = Preferences.getHelp("DefaultScheme") + path.strip() - url = QUrl.fromEncoded(urlString.encode(), QUrl.TolerantMode) + url = QUrl.fromEncoded(urlString.encode("utf-8"), QUrl.TolerantMode) return url
--- a/Helpviewer/HelpWindow.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/HelpWindow.py Sat Jul 25 13:02:39 2015 +0200 @@ -3684,7 +3684,7 @@ except IOError: pass - encodedStyle = bytes(QByteArray(userStyle.encode()).toBase64()).decode() + encodedStyle = bytes(QByteArray(userStyle.encode("utf-8")).toBase64()).decode() dataString = "data:text/css;charset=utf-8;base64,{0}".format( encodedStyle)
--- a/Helpviewer/History/HistoryManager.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/History/HistoryManager.py Sat Jul 25 13:02:39 2015 +0200 @@ -481,7 +481,7 @@ stream.setVersion(QDataStream.Qt_4_6) itm = self.__history[index] stream.writeUInt32(HISTORY_VERSION) - stream.writeString(itm.url.encode()) + stream.writeString(itm.url.encode("utf-8")) stream << itm.dateTime stream.writeString(itm.title.encode('utf-8')) f.write(data)
--- a/Helpviewer/Network/EricAccessHandler.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/Network/EricAccessHandler.py Sat Jul 25 13:02:39 2015 +0200 @@ -113,11 +113,11 @@ self._speedDialPage = Utilities.html_uencode(html) import Helpviewer.HelpWindow - html = QByteArray(self._speedDialPage.encode()) + html = QByteArray(self._speedDialPage.encode("utf-8")) dial = Helpviewer.HelpWindow.HelpWindow.speedDial() - html.replace("@INITIAL-SCRIPT@", dial.initialScript().encode()) - html.replace("@ROW-PAGES@", str(dial.pagesInRow()).encode()) - html.replace("@SD-SIZE@", str(dial.sdSize()).encode()) + html.replace("@INITIAL-SCRIPT@", dial.initialScript().encode("utf-8")) + html.replace("@ROW-PAGES@", str(dial.pagesInRow()).encode("utf-8")) + html.replace("@SD-SIZE@", str(dial.sdSize()).encode("utf-8")) return html
--- a/Helpviewer/Network/NetworkAccessManager.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/Network/NetworkAccessManager.py Sat Jul 25 13:02:39 2015 +0200 @@ -190,7 +190,7 @@ # Send referer header? if not self.__sendReferer and \ req.url().host() not in Preferences.getHelp("SendRefererWhitelist"): - req.setRawHeader(b"Referer", "") + req.setRawHeader(b"Referer", b"") reply = QNetworkAccessManager.createRequest( self, op, req, outgoingData)
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngine.py Sat Jul 25 13:02:39 2015 +0200 @@ -151,7 +151,7 @@ return QUrl() ret = QUrl.fromEncoded( - self.parseTemplate(searchTerm, self._searchUrlTemplate).encode()) + self.parseTemplate(searchTerm, self._searchUrlTemplate).encode("utf-8")) if self.__searchMethod != "post": if qVersion() >= "5.0.0": @@ -206,7 +206,7 @@ return QUrl() ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( - searchTerm, self._suggestionsUrlTemplate).encode())) + searchTerm, self._suggestionsUrlTemplate).encode("utf-8"))) if self.__searchMethod != "post": if qVersion() >= "5.0.0": @@ -337,7 +337,7 @@ return reply = self.__networkAccessManager.get( - QNetworkRequest(QUrl.fromEncoded(self._imageUrl.encode()))) + QNetworkRequest(QUrl.fromEncoded(self._imageUrl.encode("utf-8")))) reply.finished.connect(self.__imageObtained) self.__replies.append(reply)
--- a/Helpviewer/Passwords/PasswordManager.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/Passwords/PasswordManager.py Sat Jul 25 13:02:39 2015 +0200 @@ -369,7 +369,7 @@ contentTypeHeader = request.rawHeader(b"Content-Type") if contentTypeHeader.isEmpty(): return - multipart = contentTypeHeader.startsWith("multipart/form-data") + multipart = contentTypeHeader.startsWith(b"multipart/form-data") if multipart: boundary = contentTypeHeader.split(" ")[1].split("=")[1] else: @@ -470,7 +470,7 @@ from PyQt5.QtCore import QUrlQuery argsUrl = QUrl.fromEncoded( QByteArray(b"foo://bar.com/?" + QUrl.fromPercentEncoding( - data.replace(b"+", b"%20")).encode())) + data.replace(b"+", b"%20")).encode("utf-8"))) encodedArgs = QUrlQuery(argsUrl).queryItems() else: argsUrl = QUrl.fromEncoded(
--- a/Helpviewer/UrlBar/UrlBar.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/UrlBar/UrlBar.py Sat Jul 25 13:02:39 2015 +0200 @@ -434,7 +434,7 @@ if mimeData.hasUrls(): url = mimeData.urls()[0] elif mimeData.hasText(): - url = QUrl.fromEncoded(mimeData.text().encode(), QUrl.TolerantMode) + url = QUrl.fromEncoded(mimeData.text().encode("utf-8"), QUrl.TolerantMode) if url.isEmpty() or not url.isValid(): E5LineEdit.dropEvent(self, evt)
--- a/Helpviewer/VirusTotalApi.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Helpviewer/VirusTotalApi.py Sat Jul 25 13:02:39 2015 +0200 @@ -112,7 +112,7 @@ request.setHeader(QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded") params = QByteArray("key={0}&resource={1}".format( - key, self.TestServiceKeyScanID).encode()) + key, self.TestServiceKeyScanID).encode("utf-8")) import Helpviewer.HelpWindow nam = Helpviewer.HelpWindow.HelpWindow.networkAccessManager() @@ -148,7 +148,7 @@ request.setHeader(QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded") params = QByteArray("key={0}&url=".format( - Preferences.getHelp("VirusTotalServiceKey")).encode())\ + Preferences.getHelp("VirusTotalServiceKey")).encode("utf-8"))\ .append(QUrl.toPercentEncoding(url.toString())) import Helpviewer.HelpWindow @@ -184,7 +184,7 @@ request.setHeader(QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded") params = QByteArray("key={0}&resource={1}".format( - Preferences.getHelp("VirusTotalServiceKey"), scanId).encode()) + Preferences.getHelp("VirusTotalServiceKey"), scanId).encode("utf-8")) import Helpviewer.HelpWindow nam = Helpviewer.HelpWindow.HelpWindow.networkAccessManager()
--- a/Plugins/CheckerPlugins/CodeStyleChecker/pep8.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/pep8.py Sat Jul 25 13:02:39 2015 +0200 @@ -1046,7 +1046,7 @@ ############################################################################## -if '' == ''.encode(): +if '' == ''.encode("utf-8"): # Python 2: implicit encoding. def readlines(filename): """Read the source code."""
--- a/Preferences/__init__.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Preferences/__init__.py Sat Jul 25 13:02:39 2015 +0200 @@ -1613,13 +1613,13 @@ profiles = json.loads(profiles) for name in ["edit", "debug"]: viewProfiles[name] = [ - QByteArray.fromBase64(profiles[name][0].encode()), + QByteArray.fromBase64(profiles[name][0].encode("utf-8")), profiles[name][1][:], [] ] for bs in profiles[name][2]: viewProfiles[name][2].append( - QByteArray.fromBase64(bs.encode())) + QByteArray.fromBase64(bs.encode("utf-8"))) else: # migrate from the old ViewProfiles settings try:
--- a/Project/CreateDialogCodeDialog.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Project/CreateDialogCodeDialog.py Sat Jul 25 13:02:39 2015 +0200 @@ -294,7 +294,7 @@ if not parameterNames[index]: parameterNames[index] = \ QByteArray("p{0:d}".format(index) - .encode()) + .encode("utf-8")) methNamesSig = \ ", ".join( [bytes(n).decode() for n in parameterNames])
--- a/QScintilla/QsciScintillaCompat.py Thu Jul 23 20:14:30 2015 +0200 +++ b/QScintilla/QsciScintillaCompat.py Sat Jul 25 13:02:39 2015 +0200 @@ -142,7 +142,7 @@ except AttributeError: rangeHigh = list(range(40, 128)) - f = font.family().encode() + f = font.family().encode("utf-8") ps = font.pointSize() weight = -font.weight() italic = font.italic()
--- a/Utilities/crypto/__init__.py Thu Jul 23 20:14:30 2015 +0200 +++ b/Utilities/crypto/__init__.py Sat Jul 25 13:02:39 2015 +0200 @@ -280,9 +280,9 @@ cipher = encryptData(key, data) except ValueError: return b"", False - return CryptoMarker.encode() + Delimiter.encode().join([ - digestname.encode(), - str(iterations).encode(), + return CryptoMarker.encode("utf-8") + Delimiter.encode("utf-8").join([ + digestname.encode("utf-8"), + str(iterations).encode("utf-8"), base64.b64encode(salt), base64.b64encode(cipher) ]), True @@ -299,13 +299,13 @@ @return decrypted data (bytes) and flag indicating success (boolean) """ - if not edata.startswith(CryptoMarker.encode()): + if not edata.startswith(CryptoMarker.encode("utf-8")): return edata, False # it was not encoded using dataEncrypt from .py3AES import decryptData from .py3PBKDF2 import rehashPassword - hashParametersBytes, edata = edata[3:].rsplit(Delimiter.encode(), 1) + hashParametersBytes, edata = edata[3:].rsplit(Delimiter.encode("utf-8"), 1) hashParameters = hashParametersBytes.decode() try: # recreate the key used to encrypt
