Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/AdBlock/AdBlockSubscription.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/AdBlock/AdBlockSubscription.py	Tue Mar 02 17:17:09 2021 +0100
@@ -130,7 +130,7 @@
         
         lastUpdateString = urlQuery.queryItemValue("lastUpdate")
         self.__lastUpdate = QDateTime.fromString(lastUpdateString,
-                                                 Qt.ISODate)
+                                                 Qt.DateFormat.ISODate)
         
         self.__loadRules()
     
@@ -154,8 +154,10 @@
         if not self.__enabled:
             queryItems.append(("enabled", "false"))
         if self.__lastUpdate.isValid():
-            queryItems.append(("lastUpdate",
-                               self.__lastUpdate.toString(Qt.ISODate)))
+            queryItems.append(
+                ("lastUpdate",
+                 self.__lastUpdate.toString(Qt.DateFormat.ISODate))
+            )
         
         query = QUrlQuery()
         query.setQueryItems(queryItems)
@@ -261,7 +263,8 @@
             return ""
         
         sha1 = bytes(QCryptographicHash.hash(
-            self.__location, QCryptographicHash.Sha1).toHex()).decode()
+            self.__location, QCryptographicHash.Algorithm.Sha1).toHex()
+        ).decode()
         dataDir = os.path.join(
             Utilities.getConfigDir(), "web_browser", "subscriptions")
         if not os.path.exists(dataDir):
@@ -277,7 +280,7 @@
         fileName = self.rulesFileName()
         f = QFile(fileName)
         if f.exists():
-            if not f.open(QIODevice.ReadOnly):
+            if not f.open(QIODevice.OpenModeFlag.ReadOnly):
                 E5MessageBox.warning(
                     None,
                     self.tr("Load subscription rules"),
@@ -391,7 +394,7 @@
         reply.close()
         self.__downloading = None
         
-        if reply.error() != QNetworkReply.NoError:
+        if reply.error() != QNetworkReply.NetworkError.NoError:
             if not self.__defaultSubscription:
                 # don't show error if we try to load the default
                 E5MessageBox.warning(
@@ -416,7 +419,7 @@
         fileName = self.rulesFileName()
         QFile.remove(fileName)
         f = QFile(fileName)
-        if not f.open(QIODevice.ReadWrite):
+        if not f.open(QIODevice.OpenModeFlag.ReadWrite):
             E5MessageBox.warning(
                 None,
                 self.tr("Downloading subscription rules"),
@@ -519,7 +522,8 @@
             return
         
         f = QFile(fileName)
-        if not f.open(QIODevice.ReadWrite | QIODevice.Truncate):
+        if not f.open(QIODevice.OpenModeFlag.ReadWrite |
+                      QIODevice.OpenModeFlag.Truncate):
             E5MessageBox.warning(
                 None,
                 self.tr("Saving subscription rules"),