Mercurial Repositories > eric / changeset
changeset
Made the third set of Qt5 compatibility changes.
Sun, 30 Sep 2012 17:23:16 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 30 Sep 2012 17:23:16 +0200
- changeset 2080
- 4b33165dd55b
- parent 2079
- febae63bb821
- child 2081
- b7ccd563eeb6
Made the third set of Qt5 compatibility changes.
--- a/E5Network/E5NetworkProxyFactory.py Sun Sep 30 17:16:04 2012 +0200 +++ b/E5Network/E5NetworkProxyFactory.py Sun Sep 30 17:23:16 2012 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import QUrl, Qt, QCoreApplication +from PyQt4.QtCore import QUrl, QCoreApplication from PyQt4.QtGui import QDialog from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkProxy, QNetworkProxyQuery @@ -19,6 +19,7 @@ import Preferences import Globals +import Utilities def schemeFromProxyType(proxyType): @@ -49,7 +50,7 @@ """ info = QCoreApplication.translate("E5NetworkProxyFactory", "<b>Connect to proxy '{0}' using:</b>")\ - .format(Qt.escape(proxy.hostName())) + .format(Utilities.html_encode(proxy.hostName())) dlg = AuthenticationDialog(info, proxy.user(), True) dlg.setData(proxy.user(), proxy.password())
--- a/Helpviewer/Network/FileReply.py Sun Sep 30 17:16:04 2012 +0200 +++ b/Helpviewer/Network/FileReply.py Sun Sep 30 17:23:16 2012 +0200 @@ -14,6 +14,8 @@ import UI.PixmapCache +import Utilities + dirListPage_html = """\ <?xml version="1.0" encoding="UTF-8" ?> @@ -255,14 +257,14 @@ i == 0 and "odd" or "even", linkClass, child.toString(), - Qt.escape(item.fileName()), + Utilities.html_encode(item.fileName()), sizeStr, item.lastModified().toString("yyyy-MM-dd hh:mm"), ) i = 1 - i content = dirListPage_html.format( - Qt.escape(baseUrl), + Utilities.html_encode(baseUrl), "".join(linkClasses.values()), self.trUtf8("Listing of {0}").format(basePath), parentStr,
--- a/Helpviewer/Network/FtpReply.py Sun Sep 30 17:16:04 2012 +0200 +++ b/Helpviewer/Network/FtpReply.py Sun Sep 30 17:23:16 2012 +0200 @@ -24,6 +24,7 @@ import UI.PixmapCache from Utilities.FtpUtilities import FtpDirLineParser, FtpDirLineParserError +import Utilities import Preferences @@ -270,7 +271,8 @@ return False, False else: info = self.trUtf8("<b>Connect to proxy '{0}' using:</b>")\ - .format(Qt.escape(Preferences.getUI("ProxyHost/Ftp"))) + .format(Utilities.html_encode( + Preferences.getUI("ProxyHost/Ftp"))) dlg = AuthenticationDialog(info, Preferences.getUI("ProxyUser/Ftp"), True) dlg.setData(Preferences.getUI("ProxyUser/Ftp"), @@ -451,14 +453,14 @@ i == 0 and "odd" or "even", linkClass, child.toString(), - Qt.escape(item.name()), + Utilities.html_encode(item.name()), sizeStr, item.lastModified().toString("yyyy-MM-dd hh:mm"), ) i = 1 - i content = ftpListPage_html.format( - Qt.escape(baseUrl), + Utilities.html_encode(baseUrl), "".join(linkClasses.values()), self.trUtf8("Listing of {0}").format(basePath), parentStr,
--- a/Helpviewer/Network/NetworkAccessManager.py Sun Sep 30 17:16:04 2012 +0200 +++ b/Helpviewer/Network/NetworkAccessManager.py Sun Sep 30 17:23:16 2012 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import pyqtSignal, QByteArray, Qt, qVersion +from PyQt4.QtCore import pyqtSignal, QByteArray, qVersion from PyQt4.QtGui import QDialog from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply try: @@ -318,32 +318,32 @@ if qVersion() >= "5.0.0": result += self.trUtf8("Name: {0}")\ - .format(Qt.escape(Utilities.decodeString( + .format(Utilities.html_encode(Utilities.decodeString( ", ".join(cert.subjectInfo(QSslCertificate.CommonName))))) result += self.trUtf8("<br/>Organization: {0}")\ - .format(Qt.escape(Utilities.decodeString( + .format(Utilities.html_encode(Utilities.decodeString( ", ".join(cert.subjectInfo(QSslCertificate.Organization))))) result += self.trUtf8("<br/>Issuer: {0}")\ - .format(Qt.escape(Utilities.decodeString( + .format(Utilities.html_encode(Utilities.decodeString( ", ".join(cert.issuerInfo(QSslCertificate.CommonName))))) else: result += self.trUtf8("Name: {0}")\ - .format(Qt.escape(Utilities.decodeString( + .format(Utilities.html_encode(Utilities.decodeString( cert.subjectInfo(QSslCertificate.CommonName)))) result += self.trUtf8("<br/>Organization: {0}")\ - .format(Qt.escape(Utilities.decodeString( + .format(Utilities.html_encode(Utilities.decodeString( cert.subjectInfo(QSslCertificate.Organization)))) result += self.trUtf8("<br/>Issuer: {0}")\ - .format(Qt.escape(Utilities.decodeString( + .format(Utilities.html_encode(Utilities.decodeString( cert.issuerInfo(QSslCertificate.CommonName)))) result += self.trUtf8("<br/>Not valid before: {0}<br/>Valid Until: {1}")\ - .format(Qt.escape(cert.effectiveDate().toString("yyyy-MM-dd")), - Qt.escape(cert.expiryDate().toString("yyyy-MM-dd"))) + .format(Utilities.html_encode(cert.effectiveDate().toString("yyyy-MM-dd")), + Utilities.html_encode(cert.expiryDate().toString("yyyy-MM-dd"))) result += "</p>"
--- a/Helpviewer/SslCertificatesDialog.py Sun Sep 30 17:16:04 2012 +0200 +++ b/Helpviewer/SslCertificatesDialog.py Sun Sep 30 17:23:16 2012 +0200 @@ -69,20 +69,20 @@ """ # step 1: extract the info to be shown if qVersion() >= "5.0.0": - organisation = Qt.escape(Utilities.decodeString( + organisation = Utilities.html_encode(Utilities.decodeString( ", ".join(cert.subjectInfo(QSslCertificate.Organization)))) - commonName = Qt.escape(Utilities.decodeString( + commonName = Utilities.html_encode(Utilities.decodeString( ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))) else: - organisation = Qt.escape(Utilities.decodeString( + organisation = Utilities.html_encode(Utilities.decodeString( cert.subjectInfo(QSslCertificate.Organization))) - commonName = Qt.escape(Utilities.decodeString( + commonName = Utilities.html_encode(Utilities.decodeString( cert.subjectInfo(QSslCertificate.CommonName))) if organisation is None or organisation == "": organisation = self.trUtf8("(Unknown)") if commonName is None or commonName == "": commonName = self.trUtf8("(Unknown common name)") - expiryDate = Qt.escape(cert.expiryDate().toString("yyyy-MM-dd")) + expiryDate = Utilities.html_encode(cert.expiryDate().toString("yyyy-MM-dd")) # step 2: create the entry items = self.serversCertificatesTree.findItems(organisation, @@ -261,20 +261,20 @@ """ # step 1: extract the info to be shown if qVersion() >= "5.0.0": - organisation = Qt.escape(Utilities.decodeString( + organisation = Utilities.html_encode(Utilities.decodeString( ", ".join(cert.subjectInfo(QSslCertificate.Organization)))) - commonName = Qt.escape(Utilities.decodeString( + commonName = Utilities.html_encode(Utilities.decodeString( ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))) else: - organisation = Qt.escape(Utilities.decodeString( + organisation = Utilities.html_encode(Utilities.decodeString( cert.subjectInfo(QSslCertificate.Organization))) - commonName = Qt.escape(Utilities.decodeString( + commonName = Utilities.html_encode(Utilities.decodeString( cert.subjectInfo(QSslCertificate.CommonName))) if organisation is None or organisation == "": organisation = self.trUtf8("(Unknown)") if commonName is None or commonName == "": commonName = self.trUtf8("(Unknown common name)") - expiryDate = Qt.escape(cert.expiryDate().toString("yyyy-MM-dd")) + expiryDate = Utilities.html_encode(cert.expiryDate().toString("yyyy-MM-dd")) # step 2: create the entry items = self.caCertificatesTree.findItems(organisation,
--- a/Helpviewer/SslInfoWidget.py Sun Sep 30 17:16:04 2012 +0200 +++ b/Helpviewer/SslInfoWidget.py Sun Sep 30 17:23:16 2012 +0200 @@ -7,7 +7,7 @@ Module implementing a widget to show SSL certificate infos. """ -from PyQt4.QtCore import QCryptographicHash, QDateTime, Qt, qVersion +from PyQt4.QtCore import QCryptographicHash, QDateTime, qVersion from PyQt4.QtGui import QWidget from PyQt4.QtNetwork import QSslCertificate @@ -70,9 +70,9 @@ self.issuerOrganizationalUnitLabel.setText(self.__certificateString( certificate.issuerInfo(QSslCertificate.OrganizationalUnitName))) self.serialNumberLabel.setText(self.__serialNumber(certificate)) - self.effectiveLabel.setText(Qt.escape( + self.effectiveLabel.setText(Utilities.html_encode( certificate.effectiveDate().toString("yyyy-MM-dd"))) - self.expiresLabel.setText(Qt.escape( + self.expiresLabel.setText(Utilities.html_encode( certificate.expiryDate().toString("yyyy-MM-dd"))) self.sha1Label.setText(self.__formatHexString( str(certificate.digest(QCryptographicHash.Sha1).toHex(), encoding="ascii"))) @@ -97,7 +97,7 @@ if txt is None or txt == "": return self.trUtf8("<not part of the certificate>") - return Qt.escape(Utilities.decodeString(txt)) + return Utilities.html_encode(Utilities.decodeString(txt)) def __serialNumber(self, cert): """ @@ -133,7 +133,7 @@ hexList.append(hexString[:2]) hexString = hexString[2:] - return Qt.escape(':'.join(hexList)) + return Utilities.html_encode(':'.join(hexList)) def __hasExpired(self, effectiveDate, expiryDate): """
--- a/Helpviewer/UrlBar/UrlBar.py Sun Sep 30 17:16:04 2012 +0200 +++ b/Helpviewer/UrlBar/UrlBar.py Sun Sep 30 17:23:16 2012 +0200 @@ -181,18 +181,18 @@ sslInfo = self.__browser.page().getSslInfo() if sslInfo is not None: if qVersion() >= "5.0.0": - org = Qt.escape(Utilities.decodeString( + org = Utilities.html_encode(Utilities.decodeString( ", ".join(sslInfo.subjectInfo(QSslCertificate.Organization)))) else: - org = Qt.escape(Utilities.decodeString( + org = Utilities.html_encode(Utilities.decodeString( sslInfo.subjectInfo(QSslCertificate.Organization))) if org == "": if qVersion() >= "5.0.0": - cn = Qt.escape(Utilities.decodeString( + cn = Utilities.html_encode(Utilities.decodeString( ", ".join( sslInfo.subjectInfo(QSslCertificate.CommonName)))) else: - cn = Qt.escape(Utilities.decodeString( + cn = Utilities.html_encode(Utilities.decodeString( sslInfo.subjectInfo(QSslCertificate.CommonName))) if cn != "": org = cn.split(".", 1)[1]
