Issue 7391 - Let rpy recursively parse filter options to dicts

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 collections import OrderedDict
+
 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 = OrderedDict(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())
+    result = OrderedDict(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.
 
     Returns
     -------
     dict
         With all strings encoded as unicode.
 
     """
+    if isinstance(data, OrderedDict):
+        return OrderedDict((strings2utf8(k), strings2utf8(v)) for k, v in

[Vasily Kuznetsov, 2019/04/02 17:36:22]

Nit: it would be better to break the string before `for` -- it's more readable
this way.

[rhowell, 2019/04/09 00:47:39]

Looks like we might not need these lines anyway. :)

+                           data.items())
     if isinstance(data, dict):
         return {strings2utf8(k): strings2utf8(v) for k, v in data.items()}
     if isinstance(data, list):
         return [strings2utf8(v) for v in data]
-    if isinstance(data, tuple):
-        return tuple(strings2utf8(v) for v in data)
     if isinstance(data, type('')):
         # The condition is a Python 2/3 way of saying "unicode string".
         return data.encode('utf-8')
     return data
 
 
 def line2dict(text, mode='body'):
     """Convert a filterlist line to a dictionary.
 
     All strings in the output dictionary will be UTF8 byte strings. This is
@@ skipping 35 matching lines @@
     -------
     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