Sat, 25 Jul 2015 13:10:09 +0200
Corrected some code style issues.
--- a/E5Gui/E5ToolBarManager.py Sat Jul 25 13:02:39 2015 +0200 +++ b/E5Gui/E5ToolBarManager.py Sat Jul 25 13:10:09 2015 +0200 @@ -504,7 +504,8 @@ for action in self.__toolBars[tbID]: if action is not None: if action.objectName(): - stream.writeString(action.objectName().encode("utf-8")) + stream.writeString(action.objectName() + .encode("utf-8")) else: stream.writeString(action.text().encode("utf-8")) else:
--- a/E5Network/E5SslUtilities.py Sat Jul 25 13:02:39 2015 +0200 +++ b/E5Network/E5SslUtilities.py Sat Jul 25 13:10:09 2015 +0200 @@ -11,6 +11,7 @@ from PyQt5.QtCore import qVersion + def initSSL(): """ Function to initialize some global SSL stuff.
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Sat Jul 25 13:02:39 2015 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Sat Jul 25 13:10:09 2015 +0200 @@ -119,7 +119,7 @@ self.__title = urlQuery.queryItemValue("title") self.__enabled = urlQuery.queryItemValue("enabled") != "false" self.__location = QByteArray(urlQuery.queryItemValue("location") - .encode("utf-8")) + .encode("utf-8")) # Check for required subscription self.__requiresLocation = urlQuery.queryItemValue(
--- a/Helpviewer/FeaturePermissionBar.py Sat Jul 25 13:02:39 2015 +0200 +++ b/Helpviewer/FeaturePermissionBar.py Sat Jul 25 13:10:09 2015 +0200 @@ -11,11 +11,12 @@ from PyQt5.QtCore import pyqtSignal, QPropertyAnimation, QByteArray, \ QEasingCurve, QPoint -from PyQt5.QtWidgets import QWidget, QLabel, QHBoxLayout, QPushButton +from PyQt5.QtWidgets import QWidget, QLabel, QHBoxLayout, QPushButton from PyQt5.QtWebKitWidgets import QWebFrame, QWebPage import UI.PixmapCache + class FeaturePermissionBar(QWidget): """ Class implementing the feature permission bar widget. @@ -40,7 +41,7 @@ self.__feature = None self.__permissionFeatureTexts = { - QWebPage.Notifications: + QWebPage.Notifications: self.tr("{0} wants to use desktop notifications."), QWebPage.Geolocation: self.tr("{0} wants to use your position.")
--- a/Helpviewer/HelpUtilities.py Sat Jul 25 13:02:39 2015 +0200 +++ b/Helpviewer/HelpUtilities.py Sat Jul 25 13:10:09 2015 +0200 @@ -90,6 +90,8 @@ @param reply network reply to be parsed @type QNetworkReply + @return file name parsed from a content disposition header + @rtype str """ path = "" # step 1: check the content disposition header for a file name
--- a/Helpviewer/HelpWindow.py Sat Jul 25 13:02:39 2015 +0200 +++ b/Helpviewer/HelpWindow.py Sat Jul 25 13:10:09 2015 +0200 @@ -3684,7 +3684,8 @@ except IOError: pass - encodedStyle = bytes(QByteArray(userStyle.encode("utf-8")).toBase64()).decode() + encodedStyle = bytes(QByteArray(userStyle.encode("utf-8")).toBase64())\ + .decode() dataString = "data:text/css;charset=utf-8;base64,{0}".format( encodedStyle)
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py Sat Jul 25 13:02:39 2015 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngine.py Sat Jul 25 13:10:09 2015 +0200 @@ -151,7 +151,8 @@ return QUrl() ret = QUrl.fromEncoded( - self.parseTemplate(searchTerm, self._searchUrlTemplate).encode("utf-8")) + self.parseTemplate(searchTerm, self._searchUrlTemplate) + .encode("utf-8")) if self.__searchMethod != "post": if qVersion() >= "5.0.0":
--- a/Helpviewer/UrlBar/UrlBar.py Sat Jul 25 13:02:39 2015 +0200 +++ b/Helpviewer/UrlBar/UrlBar.py Sat Jul 25 13:10:09 2015 +0200 @@ -434,7 +434,8 @@ if mimeData.hasUrls(): url = mimeData.urls()[0] elif mimeData.hasText(): - url = QUrl.fromEncoded(mimeData.text().encode("utf-8"), 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 Sat Jul 25 13:02:39 2015 +0200 +++ b/Helpviewer/VirusTotalApi.py Sat Jul 25 13:10:09 2015 +0200 @@ -184,7 +184,8 @@ request.setHeader(QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded") params = QByteArray("key={0}&resource={1}".format( - Preferences.getHelp("VirusTotalServiceKey"), scanId).encode("utf-8")) + Preferences.getHelp("VirusTotalServiceKey"), scanId) + .encode("utf-8")) import Helpviewer.HelpWindow nam = Helpviewer.HelpWindow.HelpWindow.networkAccessManager()
--- a/Project/CreateDialogCodeDialog.py Sat Jul 25 13:02:39 2015 +0200 +++ b/Project/CreateDialogCodeDialog.py Sat Jul 25 13:10:09 2015 +0200 @@ -294,7 +294,7 @@ if not parameterNames[index]: parameterNames[index] = \ QByteArray("p{0:d}".format(index) - .encode("utf-8")) + .encode("utf-8")) methNamesSig = \ ", ".join( [bytes(n).decode() for n in parameterNames])