| OLD | NEW | 
|---|
| 1 # This file is part of Adblock Plus <https://adblockplus.org/>, | 1 # This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 2 # Copyright (C) 2006-present eyeo GmbH | 2 # Copyright (C) 2006-present eyeo GmbH | 
| 3 # | 3 # | 
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify | 
| 5 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as | 
| 6 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. | 
| 7 # | 7 # | 
| 8 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, | 
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 60     }, | 60     }, | 
| 61     '@@http://bla$~script,~other,sitekey=foo|bar': { | 61     '@@http://bla$~script,~other,sitekey=foo|bar': { | 
| 62         'selector': {'type': ST.URL_PATTERN, 'value': 'http://bla'}, | 62         'selector': {'type': ST.URL_PATTERN, 'value': 'http://bla'}, | 
| 63         'action': FA.ALLOW, | 63         'action': FA.ALLOW, | 
| 64         'options': [ | 64         'options': [ | 
| 65             (OPT.SCRIPT, False), | 65             (OPT.SCRIPT, False), | 
| 66             (OPT.OTHER, False), | 66             (OPT.OTHER, False), | 
| 67             (OPT.SITEKEY, ['foo', 'bar']), | 67             (OPT.SITEKEY, ['foo', 'bar']), | 
| 68         ], | 68         ], | 
| 69     }, | 69     }, | 
|  | 70     "||foo.com^$csp=script-src 'self' * 'unsafe-inline',script,sitekey=foo," + | 
|  | 71     'other,match-case,domain=foo.com': { | 
|  | 72         'selector': {'type': ST.URL_PATTERN, 'value': '||foo.com^'}, | 
|  | 73         'action': FA.BLOCK, | 
|  | 74         'options': [ | 
|  | 75             (OPT.CSP, "script-src 'self' * 'unsafe-inline'"), | 
|  | 76             ('script', True), | 
|  | 77             ('sitekey', ['foo']), | 
|  | 78             ('other', True), | 
|  | 79             ('match-case', True), | 
|  | 80             ('domain', [('foo.com', True)]), | 
|  | 81         ], | 
|  | 82     }, | 
|  | 83     'bla$~match-case,~csp=csp,~script,~other,~third-party,domain=~bar.com': { | 
|  | 84         'selector': {'type': ST.URL_PATTERN, 'value': 'bla'}, | 
|  | 85         'action': FA.BLOCK, | 
|  | 86         'options': [ | 
|  | 87             ('match-case', False), | 
|  | 88             ('csp', False), | 
|  | 89             ('script', False), | 
|  | 90             ('other', False), | 
|  | 91             ('third-party', False), | 
|  | 92             ('domain', [('bar.com', False)]), | 
|  | 93         ], | 
|  | 94     }, | 
|  | 95     '@@bla$script,other,domain=foo.com|~bar.foo.com,csp=c s p': { | 
|  | 96         'selector': {'type': ST.URL_PATTERN, 'value': 'bla'}, | 
|  | 97         'action': FA.ALLOW, | 
|  | 98         'options': [ | 
|  | 99             ('script', True), | 
|  | 100             ('other', True), | 
|  | 101             ('domain', [('foo.com', True), ('bar.foo.com', False)]), | 
|  | 102             ('csp', 'c s p'), | 
|  | 103         ], | 
|  | 104     }, | 
| 70     # Element hiding filters and exceptions. | 105     # Element hiding filters and exceptions. | 
| 71     '##ddd': { | 106     '##ddd': { | 
| 72         'selector': {'type': ST.CSS, 'value': 'ddd'}, | 107         'selector': {'type': ST.CSS, 'value': 'ddd'}, | 
| 73         'action': FA.HIDE, | 108         'action': FA.HIDE, | 
| 74         'options': [], | 109         'options': [], | 
| 75     }, | 110     }, | 
| 76     '#@#body > div:first-child': { | 111     '#@#body > div:first-child': { | 
| 77         'selector': {'type': ST.CSS, 'value': 'body > div:first-child'}, | 112         'selector': {'type': ST.CSS, 'value': 'body > div:first-child'}, | 
| 78         'action': FA.SHOW, | 113         'action': FA.SHOW, | 
| 79         'options': [], | 114         'options': [], | 
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 158 def test_exception_timing(): | 193 def test_exception_timing(): | 
| 159     result = parse_filterlist(['! good line', '%bad line%']) | 194     result = parse_filterlist(['! good line', '%bad line%']) | 
| 160     assert next(result) == Comment('good line') | 195     assert next(result) == Comment('good line') | 
| 161     with pytest.raises(ParseError): | 196     with pytest.raises(ParseError): | 
| 162         next(result) | 197         next(result) | 
| 163 | 198 | 
| 164 | 199 | 
| 165 def test_parse_line_bytes(): | 200 def test_parse_line_bytes(): | 
| 166     line = parse_line(b'! \xc3\xbc') | 201     line = parse_line(b'! \xc3\xbc') | 
| 167     assert line.text == '\xfc' | 202     assert line.text == '\xfc' | 
| OLD | NEW | 
|---|