strip if you don't want newlines at the end of files

Author: ojii

cms/middleware/toolbar.py

@@ -38,7 +38,9 @@ def toolbar_plugin_processor(instance, placeholder, rendered_content, original_c
             'move_url': placeholder.get_move_url(),
         }
     original_context.update(data)
-    output = render_to_string(instance.get_plugin_class().frontend_edit_template, original_context)
+    plugin_class = instance.get_plugin_class()
+    template = plugin_class.frontend_edit_template
+    output = render_to_string(template, original_context).strip()
     original_context.pop()
     return output
 

cms/templatetags/cms_tags.py

@@ -729,7 +729,7 @@ def render_tag(self, context, **kwargs):
         context.push()
         template = self.get_template(context, **kwargs)
         data = self.get_context(context, **kwargs)
-        output = render_to_string(template, data)
+        output = render_to_string(template, data).strip()
         context.pop()
         if kwargs.get('varname'):
             context[kwargs['varname']] = output