eric: comparison Helpviewer/AdBlock/AdBlockSubscription.py

-:28c75409a78f
+:971d84f7a6d6
 import os
 import re
 import hashlib
 import base64
-from PyQt4.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, QUrl, \
+from PyQt4.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, \
-QCryptographicHash, QFile, QIODevice, QTextStream, QDate, QTime
+QUrl, QCryptographicHash, QFile, QIODevice, QTextStream, QDate, QTime
 from PyQt4.QtNetwork import QNetworkReply
 from E5Gui import E5MessageBox
 import Utilities
 self.__domainRestrictedCssRules = []
 self.__elementHidingRules = ""
 self.__documentRules = []
 self.__elemhideRules = []
-self.__checksumRe = re.compile(r"""^\s*!\s*checksum[\s\-:]+([\w\+\/=]+).*\n""",
+self.__checksumRe = re.compile(
+r"""^\s*!\s*checksum[\s\-:]+([\w\+\/=]+).*\n""",
 re.IGNORECASE | re.MULTILINE)
 self.__expiresRe = re.compile(
 r"""(?:expires:|expires after)\s*(\d+)\s*(hour|h)?""",
 re.IGNORECASE)
 self.__remoteModifiedRe = re.compile(
 if url.path() != "subscribe":
 return
 self.__title = \
 QUrl.fromPercentEncoding(url.encodedQueryItemValue("title"))
-self.__enabled = \
+self.__enabled = QUrl.fromPercentEncoding(
-QUrl.fromPercentEncoding(url.encodedQueryItemValue("enabled")) != "false"
+url.encodedQueryItemValue("enabled")) != "false"
-self.__location = \
+self.__location = QByteArray(QUrl.fromPercentEncoding(
-QByteArray(QUrl.fromPercentEncoding(url.encodedQueryItemValue("location")))
+url.encodedQueryItemValue("location")))
 # Check for required subscription
-self.__requiresLocation = \
+self.__requiresLocation = QUrl.fromPercentEncoding(
-QUrl.fromPercentEncoding(url.encodedQueryItemValue("requiresLocation"))
+url.encodedQueryItemValue("requiresLocation"))
-self.__requiresTitle = \
+self.__requiresTitle = QUrl.fromPercentEncoding(
-QUrl.fromPercentEncoding(url.encodedQueryItemValue("requiresTitle"))
+url.encodedQueryItemValue("requiresTitle"))
 if self.__requiresLocation and self.__requiresTitle:
 import Helpviewer.HelpWindow
-Helpviewer.HelpWindow.HelpWindow.adBlockManager().loadRequiredSubscription(
+Helpviewer.HelpWindow.HelpWindow.adBlockManager()\
-self.__requiresLocation, self.__requiresTitle)
+.loadRequiredSubscription(self.__requiresLocation,
+self.__requiresTitle)
 lastUpdateByteArray = url.encodedQueryItemValue("lastUpdate")
 lastUpdateString = QUrl.fromPercentEncoding(lastUpdateByteArray)
 self.__lastUpdate = QDateTime.fromString(lastUpdateString, Qt.ISODate)
 return self.location().toLocalFile()
 if self.__location.isEmpty():
 return ""
-sha1 = bytes(
+sha1 = bytes(QCryptographicHash.hash(
-QCryptographicHash.hash(self.__location, QCryptographicHash.Sha1).toHex())\
+self.__location, QCryptographicHash.Sha1).toHex()).decode()
-.decode()
+dataDir = os.path.join(
-dataDir = os.path.join(Utilities.getConfigDir(), "browser", "subscriptions")
+Utilities.getConfigDir(), "browser", "subscriptions")
 if not os.path.exists(dataDir):
 os.makedirs(dataDir)
-fileName = os.path.join(dataDir, "adblock_subscription_{0}".format(sha1))
+fileName = os.path.join(
+dataDir, "adblock_subscription_{0}".format(sha1))
 return fileName
 def __loadRules(self):
 """
 Private method to load the rules of the subscription.
 f = QFile(fileName)
 if f.exists():
 if not f.open(QIODevice.ReadOnly):
 E5MessageBox.warning(None,
 self.trUtf8("Load subscription rules"),
-self.trUtf8("""Unable to open adblock file '{0}' for reading.""")\
+self.trUtf8(
+"""Unable to open adblock file '{0}' for reading.""")\
 .format(fileName))
 else:
 textStream = QTextStream(f)
 header = textStream.readLine(1024)
 if not header.startswith("[Adblock"):
 else:
 # days
 self.__updatePeriod = int(period) * 24
 remoteModified = self.__remoteModifiedRe.search(line)
 if remoteModified:
-day, month, year, time, hour, minute = remoteModified.groups()
+day, month, year, time, hour, minute = \
+remoteModified.groups()
 self.__remoteModified.setDate(
-QDate(int(year), self.__monthNameToNumber[month],
+QDate(int(year),
-int(day)))
+self.__monthNameToNumber[month],
+int(day))
+)
 if time:
 self.__remoteModified.setTime(
 QTime(int(hour), int(minute)))
 self.__populateCache()
 self.changed.emit()
 if reply.error() != QNetworkReply.NoError:
 if not self.__defaultSubscription:
 # don't show error if we try to load the default
 E5MessageBox.warning(None,
 self.trUtf8("Downloading subscription rules"),
-self.trUtf8("""<p>Subscription rules could not be downloaded.</p>"""
+self.trUtf8(
-"""<p>Error: {0}</p>""").format(reply.errorString()))
+"""<p>Subscription rules could not be"""
+""" downloaded.</p><p>Error: {0}</p>""")
+.format(reply.errorString()))
 else:
 # reset after first download attempt
 self.__defaultSubscription = False
 return
 QFile.remove(fileName)
 f = QFile(fileName)
 if not f.open(QIODevice.ReadWrite):
 E5MessageBox.warning(None,
 self.trUtf8("Downloading subscription rules"),
-self.trUtf8("""Unable to open adblock file '{0}' for writing.""")\
+self.trUtf8(
+"""Unable to open adblock file '{0}' for writing.""")\
 .file(fileName))
 return
 f.write(response)
 f.close()
 self.__lastUpdate = QDateTime.currentDateTime()
 data = re.sub(self.__checksumRe, "", data)  # remove checksum line
 # 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:
 res = E5MessageBox.yesNo(None,
 self.trUtf8("Downloading subscription rules"),
-self.trUtf8("""<p>AdBlock subscription <b>{0}</b> has a wrong"""
+self.trUtf8(
-""" checksum.<br/>"""
+"""<p>AdBlock subscription <b>{0}</b> has a wrong"""
-"""Found: {1}<br/>"""
+""" checksum.<br/>"""
-"""Calculated: {2}<br/>"""
+"""Found: {1}<br/>"""
-"""Use it anyway?</p>""")\
+"""Calculated: {2}<br/>"""
-.format(self.__title, expectedChecksum, calculatedChecksum))
+"""Use it anyway?</p>""")\
+.format(self.__title, expectedChecksum,
+calculatedChecksum))
 return res
 def saveRules(self):
 """
 Public method to save the subscription rules.
 f = QFile(fileName)
 if not f.open(QIODevice.ReadWrite | QIODevice.Truncate):
 E5MessageBox.warning(None,
 self.trUtf8("Saving subscription rules"),
-self.trUtf8("""Unable to open adblock file '{0}' for writing.""")\
+self.trUtf8(
+"""Unable to open adblock file '{0}' for writing.""")\
 .format(fileName))
 return
 textStream = QTextStream(f)
 if not self.__rules or not self.__rules[0].isHeader():
 return False
 def elemHideDisabledForUrl(self, url):
 """
-Public method to check, if element hiding is disabled for the given URL.
+Public method to check, if element hiding is disabled for the given
+URL.
 @param url URL to check (QUrl)
 @return flag indicating disabled state (boolean)
 """
 if self.adBlockDisabledForUrl(url):
 rule = self.__rules[offset]
 rule.setEnabled(enabled)
 if rule.isCSSRule():
 import Helpviewer.HelpWindow
 self.__populateCache()
-Helpviewer.HelpWindow.HelpWindow.mainWindow().reloadUserStyleSheet()
+Helpviewer.HelpWindow.HelpWindow.mainWindow()\
+.reloadUserStyleSheet()
 return rule

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/AdBlock/AdBlockSubscription.py

Helpviewer/AdBlock/AdBlockSubscription.py