Mercurial Repositories > eric / file comparison
comparison: Helpviewer/AdBlock/AdBlockManager.py
Helpviewer/AdBlock/AdBlockManager.py
- changeset 4331
- 711e7c35a49b
- parent 4021
- 195a471c327b
- child 4631
- 5c1a96925da4
equal
deleted
inserted
replaced
| 4327:ff666d8230f7 | 4331:711e7c35a49b |
|---|---|
| 296 subscriptions.append(self.__customSubscriptionUrlString) | 296 subscriptions.append(self.__customSubscriptionUrlString) |
| 297 else: | 297 else: |
| 298 subscriptions = [self.__defaultSubscriptionUrlString, | 298 subscriptions = [self.__defaultSubscriptionUrlString, |
| 299 self.__customSubscriptionUrlString] | 299 self.__customSubscriptionUrlString] |
| 300 for subscription in subscriptions: | 300 for subscription in subscriptions: |
| 301 url = QUrl.fromEncoded(subscription.encode()) | 301 url = QUrl.fromEncoded(subscription.encode("utf-8")) |
| 302 adBlockSubscription = AdBlockSubscription( | 302 adBlockSubscription = AdBlockSubscription( |
| 303 url, | 303 url, |
| 304 subscription.startswith(self.__customSubscriptionUrlString), | 304 subscription.startswith(self.__customSubscriptionUrlString), |
| 305 self, | 305 self, |
| 306 subscription.startswith(self.__defaultSubscriptionUrlString)) | 306 subscription.startswith(self.__defaultSubscriptionUrlString)) |
| 325 if subscription.url().toString().startswith(urlString): | 325 if subscription.url().toString().startswith(urlString): |
| 326 # We found it! | 326 # We found it! |
| 327 return | 327 return |
| 328 | 328 |
| 329 # Step 2: if it is not, get it | 329 # Step 2: if it is not, get it |
| 330 url = QUrl.fromEncoded(urlString.encode()) | 330 url = QUrl.fromEncoded(urlString.encode("utf-8")) |
| 331 adBlockSubscription = AdBlockSubscription(url, False, self) | 331 adBlockSubscription = AdBlockSubscription(url, False, self) |
| 332 self.addSubscription(adBlockSubscription) | 332 self.addSubscription(adBlockSubscription) |
| 333 self.requiredSubscriptionLoaded.emit(adBlockSubscription) | 333 self.requiredSubscriptionLoaded.emit(adBlockSubscription) |
| 334 | 334 |
| 335 def getRequiresSubscriptions(self, subscription): | 335 def getRequiresSubscriptions(self, subscription): |
