Issue 2452 - Avoid replacing "\n" with newline in fixed strings

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 124 matching lines @@
     # Extract tag attributes from default string
     default, saved_attributes, fixed_strings = self._attribute_parser.parse(default, self._params["page"])
 
     # Get translation
     if self._params["locale"] != self._params["defaultlocale"] and name in localedata:
       result = localedata[name].strip()
     else:
       result = default
 
     # Insert fixed strings
     for i in range(len(fixed_strings)):

[Sebastian Noack, 2015/05/06 16:24:30]

While on it, mind making this loop a little more Pythonic?

  for i, fixed_string in enumerate(fixed_strings):

[Sebastian Noack, 2015/05/06 16:25:24]

Even better:

  for i, fixed_string in enumerate(fixed_strings, 1):

Then you don't need to add 1 below.

[kzar, 2015/05/06 16:30:41]

Done.

-      result = re.sub(r"\{%d\}" % (i + 1), fixed_strings[i], result, 1)
+      result = result.replace("{%d}" % (i + 1), fixed_strings[i], 1)
 
     # Insert attributes
     result = escape(result)
     def stringify_attribute((name, value)):
       return '%s="%s"' % (
         escape(name),
         escape(self.insert_localized_strings(value, {}))
       )
 
     for tag in self.whitelist:
@@ skipping 240 matching lines @@
         stack.pop()
       stack[-1]["subitems"].append(item)
       stack.append(item)
     return structured
 
 converters = {
   "html": RawConverter,
   "md": MarkdownConverter,
   "tmpl": TemplateConverter,
 }