Fixes 4969 - Add parsing of filters

abp/filters/parser.py

 # This file is part of Adblock Plus <https://adblockplus.org/>,
-# Copyright (C) 2006-2017 eyeo GmbH
+# Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import unicode_literals
 
 import re
 from collections import namedtuple
 
-__all__ = ['parse_filterlist', 'parse_line', 'ParseError',
-           'SELECTOR_TYPE', 'FILTER_ACTION', 'FILTER_OPTION']
+__all__ = [
+    'FILTER_ACTION',
+    'FILTER_OPTION',
+    'ParseError',
+    'SELECTOR_TYPE',
+    'parse_filterlist',
+    'parse_line',
+]
 
 
 class ParseError(Exception):
     """Exception thrown by the parser when it encounters invalid input.
 
     :param error: Description of the error.
     :param text: The text which was being parsed when an error occurred.
     """
 
     def __init__(self, error, text):
@@ skipping 49 matching lines @@
 
     # Other options.
     MATCH_CASE = 'match-case'
     DOMAIN = 'domain'
     THIRD_PARTY = 'third-party'
     COLLAPSE = 'collapse'
     SITEKEY = 'sitekey'
     DONOTTRACK = 'donottrack'
 
 
-ALL_OPTIONS = {opt for name, opt in vars(FILTER_OPTION).items()
-               if not name.startswith('__')}
-
-
 def _line_type(name, field_names, format_string):
     """Define a line type.
 
     :param name: The name of the line type to define.
     :param field_names: A sequence of field names or one space-separated
         string that contains all field names.
     :param format_string: A format specifier for converting this line type
         back to string representation.
     :returns: Class created with `namedtuple` that has `.type` set to
         lowercased `name` and supports conversion back to string with
@@ skipping 49 matching lines @@
     if '=' in option:
         return option.split('=', 1)
     if option.startswith('~'):
         return option[1:], False
     return option, True
 
 
 def _parse_filter_option(option):
     name, value = _parse_option(option)
 
-    if name not in ALL_OPTIONS:

[mathias, 2017/08/01 06:31:35]

I don't think this part of the code should validate whether an option is
recognized, at least not unconditionally, for the sake of compatibility with
future versions but also because parsing and validating is not necessarily the
same step.

[Vasily Kuznetsov, 2017/08/02 16:21:17]

Following our conversation, I agree. Done

-        raise ParseError('Unrecognized option', name)
-
     # Handle special cases of multivalued options.
     if name == FILTER_OPTION.DOMAIN:
         value = [_parse_option(o) for o in value.split('|')]
     elif name == FILTER_OPTION.SITEKEY:
         value = value.split('|')
 
     return name, value
 
 
-def _parse_filter_options(options, separator=','):

[mathias, 2017/08/01 06:31:35]

Why is the separator a parameter? The only place where this private function is
invoked is _parse_blocking_filter, and that one does not bother passing a custom
separator.

[Vasily Kuznetsov, 2017/08/02 16:21:17]

This is left-over from an earlier version that used this parameter. Now removed.

-    return [_parse_filter_option(o) for o in options.split(separator)]
+def _parse_filter_options(options):
+    return [_parse_filter_option(o) for o in options.split(',')]
 
 
 def _parse_blocking_filter(text):
     # Based on RegExpFilter.fromText in lib/filterClasses.js
     # in https://hg.adblockplus.org/adblockpluscore.
     action = FILTER_ACTION.BLOCK
     options = []
     selector = text
 
     if selector.startswith('@@'):
@@ skipping 71 matching lines @@
 
 def parse_filterlist(lines):
     """Parse filter list from an iterable.
 
     :param lines: List of strings or file or other iterable.
     :returns: Iterator over parsed lines.
     :raises ParseError: Can be thrown during iteration for invalid lines.
     """
     for line in lines:
         yield parse_line(line)