diff -r ebab8ba287e6 -r 6b42677d7043 eric6/WebBrowser/AdBlock/AdBlockRule.py
--- a/eric6/WebBrowser/AdBlock/AdBlockRule.py Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/WebBrowser/AdBlock/AdBlockRule.py Mon Sep 02 18:50:38 2019 +0200
@@ -13,11 +13,9 @@
from enum import IntEnum
-from PyQt5.QtCore import PYQT_VERSION, Qt, QRegExp
+from PyQt5.QtCore import Qt, QRegExp
from PyQt5.QtWebEngineCore import QWebEngineUrlRequestInfo
-from Globals import qVersionTuple
-
def toSecondLevelDomain(url):
"""
@@ -655,11 +653,12 @@
"""
match = (
req.resourceType() ==
- QWebEngineUrlRequestInfo.ResourceTypeSubResource)
- if qVersionTuple() >= (5, 7, 0) and PYQT_VERSION >= 0x50700:
- match = match or (
- req.resourceType() ==
- QWebEngineUrlRequestInfo.ResourceTypePluginResource)
+ QWebEngineUrlRequestInfo.ResourceTypeSubResource
+ )
+ match = match or (
+ req.resourceType() ==
+ QWebEngineUrlRequestInfo.ResourceTypePluginResource
+ )
if self.__objectSubrequestException:
return not match
