Issue 7471 - Add an API for working with blocks of filters

abp/filters/rpy.py

 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # 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/>.
 
 """
 Functions for integrating with rPython.
 
 see: https://cran.r-project.org/web/packages/rPython/index.html
 """
 
 from __future__ import unicode_literals
 
 from abp.filters import parse_line
 
 __all__ = ['line2dict']
-
-
-def option_list_to_dict(options):
-    """Recursively parse filter options into dicts.
-
-    Parameters
-    ----------
-    options: A list of tuples
-        The filter options
-
-    Returns
-    -------
-    dict
-        The resulting dictionary
-
-    """
-    result = dict(options)
-    if 'domain' in result:
-        result['domain'] = option_list_to_dict(result['domain'])
-
-    return result
-
-
-def tuple2dict(data):
-    """Convert a parsed filter from a namedtuple to a dict.
-
-    Parameters
-    ----------
-    data: namedtuple
-        The parsed filter.
-
-    Returns
-    -------
-    dict
-        The resulting dictionary
-
-    """
-    result = dict(data._asdict())
-    if 'options' in result:
-        result['options'] = option_list_to_dict(result['options'])
-
-    result['type'] = data.__class__.__name__
-
-    return result
 
 
 def strings2utf8(data):
     """Convert strings in a data structure to utf8 byte strings.
 
     Parameters
     ----------
     data: dict
         The data to convert. Can include nested dicts, lists and tuples.
 
@@ skipping 26 matching lines @@
     mode: str
         Parsing mode (see `abp.filters.parser.parse_line`).
 
     Returns
     -------
     dict
         With the parsing results and all strings converted to utf8 byte
         strings.
 
     """
-    return strings2utf8(tuple2dict(parse_line(text, mode)))
+    return strings2utf8(parse_line(text, mode).to_dict())
 
 
 def lines2dicts(string_list, mode='body'):
     """Convert a list of filterlist strings to a dictionary.
 
     All strings in the output dictionary will be UTF8 byte strings. This is
     necessary to prevent unicode encoding errors in rPython conversion layer.
 
     Parameters
     ----------
     string_list: iterable of str
         Each string in the list can be an empty line, include instruction, or
         filter. If the mode is 'start', headers and metadata can also be
         parsed.
     mode: str
         Parsing mode (see `abp.filters.parser.parse_line`).
 
     Returns
     -------
     list of dict
         With the parsing results and all strings converted to utf8 byte
         strings.
 
     """
     result = []
     for string in string_list:
         result.append(line2dict(string, mode))
     return result