remove escaping of variable values as it is handled by jinja2 since at least 2.10

secretary.py

@@ -29,7 +29,6 @@ import re
 import sys
 import logging
 import zipfile
-import jinja2
 from os import path
 from mimetypes import guess_type, guess_extension
 from uuid import uuid4
@@ -135,27 +134,18 @@ class Renderer(object):
             self.environment = environment
         else:
             self.environment = Environment(undefined=UndefinedSilently,
-                                           autoescape=True,
-                                           finalize=self.finalize_value)
+                                           autoescape=True)
             # Register filters
             self.environment.filters['pad'] = pad_string
             self.environment.filters['markdown'] = self.markdown_filter
             self.environment.filters['image'] = self.image_filter
-            self.environment.globals['SafeValue'] = jinja2.Markup
+            self.environment.globals['SafeValue'] = Markup
 
         self.media_path = kwargs.pop('media_path', '')
         self.media_callback = self.fs_loader
 
         self._compile_tags_expressions()
 
-    @jinja2.evalcontextfilter
-    def finalize_value(self, value, *args):
-        """Escapes variables values."""
-        if isinstance(value, Markup):
-            return value
-
-        return Markup(self.get_escaped_var_value(value))
-
     def media_loader(self, callback):
         """This sets the the media loader. A user defined function which
         loads media. The function should take a template value, optionals
@@ -449,21 +439,6 @@ class Renderer(object):
 
         return xml_text
 
-    @staticmethod
-    def get_escaped_var_value(value):
-        """
-        Encodes XML reserved chars in value (eg. &, <, >) and also replaces
-        the control chars \n and \t control chars to their ODF counterparts.
-        """
-        value = Markup.escape(value)
-        return (
-            value.replace('\n', Markup('<text:line-break/>'))
-                 .replace('\t', Markup('<text:tab/>'))
-                 .replace('\x0b', '<text:space/>')
-                 .replace('\x0c', '<text:space/>')
-        )
-
-
     def add_media_to_archive(self, media, mime, name=''):
         """
         Adds to "Pictures" archive folder the file in `media` and register