0001-misc-move-RTF-escape-code-to-ezt-processor-25521.patch

Frédéric Péters, 28 juillet 2018 15:05

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/3] misc: move RTF escape code to ezt processor (#25521)

 wcs/qommon/ezt.py         | 15 +++++++++++++++
 wcs/wf/export_to_model.py | 22 ++--------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

     FORMAT_RAW = 'raw'
     FORMAT_HTML = 'html'
     FORMAT_XML = 'xml'
     FORMAT_RTF = 'rtf'
+    #
     # This regular expression matches three alternatives:
-...
         FORMAT_RAW  : '_cmd_print',
         FORMAT_HTML : '_cmd_print_html',
         FORMAT_XML  : '_cmd_print_xml',
         FORMAT_RTF  : '_cmd_print_rtf',
+        }
       def __init__(self, fname=None, compress_whitespace=1,
-...
       def _cmd_print_html(self, valref, fp, ctx):
         _write_value(valref, fp, ctx, cgi.escape)
       def _cmd_print_rtf(self, valref, fp, ctx):
         def char2rtf(c):
           if ord(c) < 128:
             return c
           else:
             return '\\u%d?' % ord(c)
         def rtf_escape(s):
           s = ''.join([char2rtf(c) for c in s])
           return '{\\uc1{%s}}' % s
         _write_value(valref, fp, ctx, rtf_escape)
       def _cmd_print_xml(self, valref, fp, ctx):
         ### use the same quoting as HTML for now
         self._cmd_print_html(valref, fp, ctx)

     from quixote.directory import Directory
     from quixote.html import htmltext
     from qommon import _
     from qommon import _, ezt
     from qommon import get_logger
     from qommon.form import (SingleSelectWidget, WidgetList, CheckboxWidget,
                              StringWidget, UploadWidget, WysiwygTextWidget, Upload,
-...
             return self.wfstatusitem.apply_template_to_formdata(self.formdata).read()
     def char2rtf(c):
         if ord(c) < 128:
             return c
         else:
             return '\\u%d?' % ord(c)
     def str2rtf(s):
         s = ''.join([char2rtf(c) for c in s])
         return '{\\uc1{%s}}' % s
     def rtf_process(value):
         if value is None:
             return None
         return str2rtf(unicode(str(value), get_publisher().site_charset))
     class ExportToModel(WorkflowStatusItem):
         description = N_('Document Creation')
         key = 'export_to_model'
-...
                 # force ezt_only=True because an RTF file may contain {{ characters
                 # and would be seen as a Django template
                 return StringIO(template_on_formdata(formdata, self.model_file.get_file().read(),
                                                      process=rtf_process, ezt_only=True))
                                                      ezt_format=ezt.FORMAT_RTF, ezt_only=True))
             except TemplateError as e:
                 url = formdata.get_url()
                 get_logger().error('error in template for export to model [%s]: %s' % (url, str(e)))
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-move-RTF-escape-code-to-ezt-processor-25521.patch