Mercurial Repositories > eric / file diff

--- a/WebBrowser/CookieJar/CookieJar.py	Sun Mar 20 15:17:31 2016 +0100
+++ b/WebBrowser/CookieJar/CookieJar.py	Sun Mar 20 20:13:29 2016 +0100
@@ -55,16 +55,15 @@
         self.__acceptCookies = self.AcceptOnlyFromSitesNavigatedTo
         self.__saveTimer = AutoSaver(self, self.__save)
         
-        self.__cookies = []
-        
         self.__cookiesFile = os.path.join(Utilities.getConfigDir(),
                                           "web_browser", "cookies.ini")
-        self.__load()
         
-        # TODO: Qt 5.6
-##        self.__store = WebBrowserWindow.webProfile.cookieStore()
-##        self.__store.cookieAdded.connect(self.__cookieAdded)
-##        self.__store.cookieRemoved.connect(self.__cookieRemoved)
+        self.__store = WebBrowserWindow.webProfile().cookieStore()
+        self.__store.cookieAdded.connect(self.__cookieAdded)
+        self.__store.cookieRemoved.connect(self.__cookieRemoved)
+        
+        self.__load()
+        self.__store.loadAllCookies()
     
     def close(self):
         """
@@ -84,22 +83,20 @@
         if not self.__loaded:
             self.__load()
         
-        self.__cookies = []
-        # TODO: Qt 5.6
-##        self.__store.deleteAllCookies()
+        self.setAllCookies([])
+        self.__store.deleteAllCookies()
         self.cookiesChanged.emit()
     
     def removeCookies(self, cookies):
         """
-        Public method to remove a cookie.
+        Public method to remove a list of cookies.
         
         @param cookies list of cookies to be removed
         @type list of QNetworkCookie
         """
         wasBlocked = self.blockSignals(True)
-        # TODO: Qt 5.6
-##        for cookie in cookies:
-##            self.__store.deleteCookie(cookie)
+        for cookie in cookies:
+            self.__store.deleteCookie(cookie)
         self.blockSignals(wasBlocked)
         
         self.cookiesChanged.emit()
@@ -163,11 +160,10 @@
         @type QNetworkCookie
         """
         if self.__rejectCookie(cookie, cookie.domain()):
-            # TODO: Qt 5.6
-##            self.__store.deleteCookie(cookie)
+            self.__store.deleteCookie(cookie)
             return
         
-        self.__cookies.append(cookie)
+        self.insertCookie(cookie)
         self.cookiesChanged.emit()
     
     @pyqtSlot(QNetworkCookie)
@@ -178,8 +174,7 @@
         @param cookie cookie which was removed
         @type QNetworkCookie
         """
-        if cookie in self.__cookies:
-            self.__cookies.remove(cookie)
+        if self.deleteCookie(cookie):
             self.cookiesChanged.emit()
     
     def __rejectCookie(self, cookie, cookieDomain):
@@ -432,4 +427,7 @@
         
         @return list of all cookies (list of QNetworkCookie)
         """
-        return self.__cookies
+        if not self.__loaded:
+            self.__load()
+        
+        return self.allCookies()