Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/AdBlock/AdBlockSubscription.py	Wed Sep 25 18:37:35 2019 +0200
+++ b/eric6/WebBrowser/AdBlock/AdBlockSubscription.py	Wed Sep 25 18:48:22 2019 +0200
@@ -13,9 +13,10 @@
 import hashlib
 import base64
 
-from PyQt5.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, \
-    QUrl, QUrlQuery, QCryptographicHash, QFile, QIODevice, QTextStream, \
-    QDate, QTime
+from PyQt5.QtCore import (
+    pyqtSignal, Qt, QObject, QByteArray, QDateTime, QUrl, QUrlQuery,
+    QCryptographicHash, QFile, QIODevice, QTextStream, QDate, QTime
+)
 from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
 
 from E5Gui import E5MessageBox
@@ -318,8 +319,9 @@
                                 self.__updatePeriod = int(period) * 24
                         remoteModified = self.__remoteModifiedRe.search(line)
                         if remoteModified:
-                            day, month, year, time, hour, minute = \
+                            day, month, year, time, hour, minute = (
                                 remoteModified.groups()
+                            )
                             self.__remoteModified.setDate(
                                 QDate(int(year),
                                       self.__monthNameToNumber[month],
@@ -344,14 +346,17 @@
         if self.__updatePeriod:
             updatePeriod = self.__updatePeriod
         else:
-            updatePeriod = \
+            updatePeriod = (
                 Preferences.getWebBrowser("AdBlockUpdatePeriod") * 24
-        if not self.__lastUpdate.isValid() or \
-           (self.__remoteModified.isValid() and
-            self.__remoteModified.addSecs(updatePeriod * 3600) <
-                QDateTime.currentDateTime()) or \
-           self.__lastUpdate.addSecs(updatePeriod * 3600) < \
-                QDateTime.currentDateTime():
+            )
+        if (
+            not self.__lastUpdate.isValid() or
+            (self.__remoteModified.isValid() and
+             self.__remoteModified.addSecs(updatePeriod * 3600) <
+                QDateTime.currentDateTime()) or
+            self.__lastUpdate.addSecs(updatePeriod * 3600) <
+                QDateTime.currentDateTime()
+        ):
             self.updateNow()
     
     def updateNow(self):
@@ -422,9 +427,11 @@
             return
         
         from WebBrowser.WebBrowserWindow import WebBrowserWindow
-        if WebBrowserWindow.adBlockManager().useLimitedEasyList() and \
+        if (
+            WebBrowserWindow.adBlockManager().useLimitedEasyList() and
             self.url().toString().startswith(
-                WebBrowserWindow.adBlockManager().getDefaultSubscriptionUrl()):
+                WebBrowserWindow.adBlockManager().getDefaultSubscriptionUrl())
+        ):
             limited = True
             # ignore Third-party advertisers rules for performance
             # whitelist rules at the end will be used
@@ -486,8 +493,9 @@
         # calculate checksum
         md5 = hashlib.md5()
         md5.update(data.encode("utf-8"))
-        calculatedChecksum = base64.b64encode(md5.digest()).decode()\
-            .rstrip("=")
+        calculatedChecksum = (
+            base64.b64encode(md5.digest()).decode().rstrip("=")
+        )
         if calculatedChecksum == expectedChecksum:
             return True
         else: