Noissue - Fix newline bug in tag attributes

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 148 matching lines @@
         escape(name),
         escape(self.insert_localized_strings(value, {}))
       )
 
     for tag in self.whitelist:
       saved = saved_attributes.get(tag, [])
       for attrs in saved:
         attrs = map(stringify_attribute, attrs)
         result = re.sub(
           r"%s([^<>]*?)%s" % (re_escape("<%s>" % tag), re_escape("</%s>" % tag)),
-          r'<%s%s>\1</%s>' % (tag, " " + " ".join(attrs) if attrs else "", tag),
+          lambda match: r'<%s%s>%s</%s>' % (

[Sebastian Noack, 2015/05/07 11:24:12]

I suppose we use a callback now, to prevent backslashes in the replacement
string to be confused with back references? At least this is the only difference
I see here. LGTM then.

[kzar, 2015/05/07 11:25:16]

Yep, you got it

+            tag,
+            " " + " ".join(attrs) if attrs else "",
+            match.group(1),
+            tag
+          ),
           result, 1, flags=re.S
         )
       result = re.sub(
         r"%s([^<>]*?)%s" % (re_escape("<%s>" % tag), re_escape("</%s>" % tag)),
         r"<%s>\1</%s>" % (tag, tag),
         result, flags=re.S
       )
     return result
 
   def insert_localized_strings(self, text, escapes, to_html=lambda s: s):
@@ skipping 227 matching lines @@
         stack.pop()
       stack[-1]["subitems"].append(item)
       stack.append(item)
     return structured
 
 converters = {
   "html": RawConverter,
   "md": MarkdownConverter,
   "tmpl": TemplateConverter,
 }