Sat, 11 Dec 2010 19:26:19 +0100
Fixed a compatibility issue with latest PyQt4 snapshots.
--- a/Helpviewer/HelpBrowserWV.py Fri Dec 10 20:40:19 2010 +0100 +++ b/Helpviewer/HelpBrowserWV.py Sat Dec 11 19:26:19 2010 +0100 @@ -161,7 +161,7 @@ self.setNetworkAccessManager(self.__proxy) self.__sslInfo = None - self.__proxy.finished[QNetworkReply].connect(self.__managerFinished) + self.__proxy.finished.connect(self.__managerFinished) def acceptNavigationRequest(self, frame, request, type_): """ @@ -176,14 +176,14 @@ self.__lastRequestType = type_ if type_ == QWebPage.NavigationTypeFormResubmitted: - res = E5MessageBox.yesNo(self.view(), - self.trUtf8("Resending POST request"), + res = E5MessageBox.yesNo(self.view(), + self.trUtf8("Resending POST request"), self.trUtf8("""In order to display the site, the request along with""" """ all the data must be sent once again, which may lead""" """ to some unexpected behaviour of the site e.g. the""" """ same action might be performed once again. Do you want""" - """ to continue anyway?"""), - icon = E5MessageBox.Warning) + """ to continue anyway?"""), + icon = E5MessageBox.Warning) if not res: return False
--- a/Helpviewer/Network/NetworkAccessManagerProxy.py Fri Dec 10 20:40:19 2010 +0100 +++ b/Helpviewer/Network/NetworkAccessManagerProxy.py Sat Dec 11 19:26:19 2010 +0100 @@ -7,7 +7,7 @@ Module implementing a network access manager proxy for web pages. """ -from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply +from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest class NetworkAccessManagerProxy(QNetworkAccessManager): """ @@ -52,7 +52,7 @@ self.__class__.primaryManager.proxyAuthenticationRequired) self.authenticationRequired.connect( self.__class__.primaryManager.authenticationRequired) - self.finished[QNetworkReply].connect(self.__class__.primaryManager.finished) + self.finished.connect(self.__class__.primaryManager.finished) def createRequest(self, op, request, outgoingData = None): """