Issue 2134 - Support both .raw and .html file extensions for raw HTML

cms/converters.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # 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,
@@ skipping 33 matching lines @@
 
 class AttributeParser(HTMLParser.HTMLParser):
   _string = None
   _attrs = None
 
   def __init__(self, whitelist):
     self._whitelist = whitelist
 
   def parse(self, text, pagename):
     self.reset()
-    self._string = ""
+    self._string = []
     self._attrs = {}
     self._pagename = pagename
 
     try:
       self.feed(text)
-      return self._string, self._attrs
+      return "".join(self._string), self._attrs
     finally:
       self._string = None
       self._attrs = None
       self._pagename = None
 
   def handle_starttag(self, tag, attrs):
     if tag not in self._whitelist:
       raise Exception("Unexpected HTML tag '%s' in localizable string on page %s" % (tag, self._pagename))
     self._attrs.setdefault(tag, []).append(attrs)
-    self._string += "<%s>" % tag
+    self._string.append("<%s>" % tag)
 
   def handle_endtag(self, tag):
-    self._string += "</%s>" % tag
+    self._string.append("</%s>" % tag)
 
   def handle_data(self, data):
     # Note: lack of escaping here is intentional. The result is a locale string,
     # HTML escaping is applied when this string is inserted into the document.
-    self._string += data
+    self._string.append(data)
 
   def handle_entityref(self, name):
-    self._string += self.unescape("&%s;" % name)
+    self._string.append(self.unescape("&%s;" % name))
 
   def handle_charref(self, name):
-    self._string += self.unescape("&#%s;" % name)
+    self._string.append(self.unescape("&#%s;" % name))
 
 class Converter:
   whitelist = set(["a", "em", "strong"])
 
   def __init__(self, params, key="pagedata"):
     self._params = params
     self._key = key
     self._attribute_parser = AttributeParser(self.whitelist)
 
     # Read in any parameters specified at the beginning of the file
@@ skipping 233 matching lines @@
     structured = []
     stack = [{"level": 0, "subitems": structured}]
     for item in flat:
       while stack[-1]["level"] >= item["level"]:
         stack.pop()
       stack[-1]["subitems"].append(item)
       stack.append(item)
     return structured
 
 converters = {
-  "raw": RawConverter,
+  "raw": RawConverter,    # deprecated, will be removed soon
   "html": RawConverter,
   "md": MarkdownConverter,
   "tmpl": TemplateConverter,
 }