Unified Diff: abp/filters/parser.py
Issue 29793573:
Issue 6701 - Implement CSP support in python-abp (Closed)
Base URL: https://hg.adblockplus.org/python-abp/
Patch Set: Check negation first, and added some tests
Created June 7, 2018, 11:12 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« .hgignore ('k')
|
tests/test_parser.py » ('j')
|
tests/test_parser.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: abp/filters/parser.py |
| =================================================================== |
| --- a/abp/filters/parser.py |
| +++ b/abp/filters/parser.py |
| @@ -100,6 +100,7 @@ |
| COLLAPSE = 'collapse' |
| SITEKEY = 'sitekey' |
| DONOTTRACK = 'donottrack' |
| + CSP = 'csp' |
| def _line_type(name, field_names, format_string): |
| @@ -145,7 +146,7 @@ |
| HEADER_REGEXP = re.compile(r'\[(Adblock(?:\s*Plus\s*[\d\.]+?)?)\]', flags=re.I) |
| HIDING_FILTER_REGEXP = re.compile(r'^([^/*|@"!]*?)#([@?])?#(.+)$') |
| FILTER_OPTIONS_REGEXP = re.compile( |
| - r'\$(~?[\w-]+(?:=[^,\s]+)?(?:,~?[\w-]+(?:=[^,\s]+)?)*)$' |
| + r'\$(~?[\w-]+(?:=[^,]+)?(?:,~?[\w-]+(?:=[^,]+)?)*)$' |
| ) |
| @@ -171,10 +172,10 @@ |
| def _parse_option(option): |
| + if option.startswith('~'): |
| + return option[1:], False |
| if '=' in option: |
| return option.split('=', 1) |
| - if option.startswith('~'): |
| - return option[1:], False |
| return option, True |
« no previous file with comments
|
« .hgignore ('k')
|
tests/test_parser.py » ('j')
|
tests/test_parser.py » ('J')
