Mercurial Repositories > eric / file comparison
comparison: Helpviewer/AdBlock/AdBlockRule.py
Helpviewer/AdBlock/AdBlockRule.py
- changeset 5736
- 000ea446ff4b
- parent 5587
- ea526b78ee6c
- child 6048
- 82ad8ec9548c
equal
deleted
inserted
replaced
| 5735:f606dbe20be6 | 5736:000ea446ff4b |
|---|---|
| 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, QUrl, qVersion | 14 from PyQt5.QtCore import Qt, QRegExp, QUrl |
| 15 from PyQt5.QtNetwork import QNetworkRequest | 15 from PyQt5.QtNetwork import QNetworkRequest |
| 16 | |
| 17 from Globals import qVersionTuple | |
| 16 | 18 |
| 17 | 19 |
| 18 # Qt version < 4.8 has an issue; it will wrongly | 20 # Qt version < 4.8 has an issue; it will wrongly |
| 19 # count .co.uk (and others) as second-level domains | 21 # count .co.uk (and others) as second-level domains |
| 20 def toSecondLevelDomain(url): | 22 def toSecondLevelDomain(url): |
| 22 Module function to get a second level domain from the given URL. | 24 Module function to get a second level domain from the given URL. |
| 23 | 25 |
| 24 @param url URL to extract domain from (QUrl) | 26 @param url URL to extract domain from (QUrl) |
| 25 @return name of second level domain (string) | 27 @return name of second level domain (string) |
| 26 """ | 28 """ |
| 27 if qVersion() >= "4.8.0": | 29 if qVersionTuple() >= (4, 8, 0): |
| 28 topLevelDomain = url.topLevelDomain() | 30 topLevelDomain = url.topLevelDomain() |
| 29 urlHost = url.host() | 31 urlHost = url.host() |
| 30 | 32 |
| 31 if not topLevelDomain or not urlHost: | 33 if not topLevelDomain or not urlHost: |
| 32 return "" | 34 return "" |
