Side by Side Diff: sitescripts/content_blocker_lists/bin/generate_lists.py
Issue 29345120:
Noissue - Got rid of non-default script encodings (Closed)
Patch Set:
Created May 28, 2016, 11:32 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« sitescripts/__init__.py ('k')
|
sitescripts/crashes/web/submitCrash.py » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # coding: utf-8 | |
| 3 | 2 |
| 4 # This file is part of Adblock Plus <https://adblockplus.org/>, | 3 # This file is part of Adblock Plus <https://adblockplus.org/>, |
| 5 # Copyright (C) 2006-2016 Eyeo GmbH | 4 # Copyright (C) 2006-2016 Eyeo GmbH |
| 6 # | 5 # |
| 7 # Adblock Plus is free software: you can redistribute it and/or modify | 6 # Adblock Plus is free software: you can redistribute it and/or modify |
| 8 # it under the terms of the GNU General Public License version 3 as | 7 # it under the terms of the GNU General Public License version 3 as |
| 9 # published by the Free Software Foundation. | 8 # published by the Free Software Foundation. |
| 10 # | 9 # |
| 11 # Adblock Plus is distributed in the hope that it will be useful, | 10 # Adblock Plus is distributed in the hope that it will be useful, |
| 12 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 89 | 88 |
| 90 easylist = download_filter_list(config["easylist_url"]) | 89 easylist = download_filter_list(config["easylist_url"]) |
| 91 exceptionrules = download_filter_list(config["exceptionrules_url"]) | 90 exceptionrules = download_filter_list(config["exceptionrules_url"]) |
| 92 | 91 |
| 93 write_block_list([easylist], | 92 write_block_list([easylist], |
| 94 config["easylist_content_blocker_path"], | 93 config["easylist_content_blocker_path"], |
| 95 config["easylist_content_blocker_expires"]) | 94 config["easylist_content_blocker_expires"]) |
| 96 write_block_list([easylist, exceptionrules], | 95 write_block_list([easylist, exceptionrules], |
| 97 config["combined_content_blocker_path"], | 96 config["combined_content_blocker_path"], |
| 98 config["combined_content_blocker_expires"]) | 97 config["combined_content_blocker_expires"]) |
| OLD | NEW |
« no previous file with comments
|
« sitescripts/__init__.py ('k')
|
sitescripts/crashes/web/submitCrash.py » ('j')
|
no next file with comments »
