Issue 1170 - [adblockplus.org Anwiki to CMS migration] Migrate content

filters/parse_interface.py

+# This file is part of the Adblock Plus website,
+# Copyright (C) 2006-2015 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/>.
+
 import re, warnings

[Sebastian Noack, 2015/02/13 17:51:49]

Licence disclaimer is missing, not only here but also in the other files.

[kzar, 2015/02/20 14:55:18]

Done.

 
 TYPE_REGEXP = r"(?:arrayof\s+)?\w+"
 
 def parse_interface(interface_items):
   parsed = []
   for key, value in interface_items.iteritems():
     if "(" in key:
       # Item is a method
-      match = re.match(r"^\s*(%s)\s+(\w+)\s*\(\s*([^\)]*)\s*\)\s*$" % TYPE_REGEXP, key)

[Sebastian Noack, 2015/02/13 17:51:49]

Be aware that \w doesn't math dashes and non-ASCII characters. Regardless of
whether this is a real use case here or not, you might just want to match \S
(not a space) instead to reduce code assumptions. Same below.

[kzar, 2015/02/20 14:55:18]

Done.

+      match = re.match(r"^\s*(%s)\s+(\S+)\s*\(\s*([^\)]*)\s*\)\s*$" % TYPE_REGEXP, key)
       if not match:
         warnings.warn("Skipped malformed method: '%s'" % key)
         continue
       return_type, property_name, argument_string = match.groups()
       arguments = []
-      if "version" in value:
-        property_version = value["version"]
-      else:
-        property_version = ""
       if argument_string:
         for argument in argument_string.split(","):
           if argument.strip():
-            match = re.match(r"^\s*(%s)\s+(\w+)\s*$" % TYPE_REGEXP, argument)
+            match = re.match(r"^\s*(%s)\s+(\S+)\s*$" % TYPE_REGEXP, argument)
             if not match:
               warnings.warn("Skipped malformed argument: '%s'" % argument)
               continue
             argument_type, argument_name = match.groups()
             arguments.append({
               "name": argument_name,
               "type": argument_type
             })
-      parsed.append({
+      value.update({
         "type": "method",
         "name": property_name,
-        "version": property_version,
         "return_type": return_type,
         "arguments": arguments
       })
+      parsed.append(value)
     else:
       # Item is a property
-      match = re.match(r"^\s*(readonly\s+)?(%s)\s+(\w+)\s*$" % TYPE_REGEXP, key)
+      match = re.match(r"^\s*(readonly\s+)?(%s)\s+(\S+)\s*$" % TYPE_REGEXP, key)
       if not match:
         warnings.warn("Skipped malformed property: '%s'" % key)
         continue
       property_modifier, property_type, property_name = match.groups()
-      parsed.append({
+      value.update({
         "type": property_type,
         "name": property_name,
         "modifier": property_modifier or ""
       })
+      parsed.append(value)
   parsed.sort(key=lambda x: x["name"])
   return parsed