Mercurial Repositories > eric / file comparison
comparison: WebBrowser/AdBlock/AdBlockRule.py
WebBrowser/AdBlock/AdBlockRule.py
- changeset 5921
- d4797da58218
- parent 5736
- 000ea446ff4b
- child 6028
- 859f6894eed9
equal
deleted
inserted
replaced
| 5920:e47dd106c3d6 | 5921:d4797da58218 |
|---|---|
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 import re | 12 import re |
| 13 | 13 |
| 14 from PyQt5.QtCore import Qt, QRegExp | 14 from PyQt5.QtCore import PYQT_VERSION, Qt, QRegExp |
| 15 from PyQt5.QtWebEngineCore import QWebEngineUrlRequestInfo | 15 from PyQt5.QtWebEngineCore import QWebEngineUrlRequestInfo |
| 16 | 16 |
| 17 from Globals import qVersionTuple | 17 from Globals import qVersionTuple |
| 18 | 18 |
| 19 | 19 |
| 532 @return flag indicating a match (boolean) | 532 @return flag indicating a match (boolean) |
| 533 """ | 533 """ |
| 534 match = ( | 534 match = ( |
| 535 req.resourceType() == | 535 req.resourceType() == |
| 536 QWebEngineUrlRequestInfo.ResourceTypeSubResource) | 536 QWebEngineUrlRequestInfo.ResourceTypeSubResource) |
| 537 if qVersionTuple() >= (5, 7, 0): | 537 if qVersionTuple() >= (5, 7, 0) and PYQT_VERSION >= 0x50700: |
| 538 match = match or ( | 538 match = match or ( |
| 539 req.resourceType() == | 539 req.resourceType() == |
| 540 QWebEngineUrlRequestInfo.ResourceTypePluginResource) | 540 QWebEngineUrlRequestInfo.ResourceTypePluginResource) |
| 541 | 541 |
| 542 if self.__objectSubrequestException: | 542 if self.__objectSubrequestException: |
