0004-change-signature-for-UploadWidget.validation-paramet.patch

Benjamin Dauvergne, 28 octobre 2015 13:13

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

Subject: [PATCH 4/4] change signature for UploadWidget.validation parameter
 (#4292)

It should be a method raising qommon.forms.UploadValidationError if the
validation fails. Return value is ignored.

 wcs/qommon/form.py        | 11 ++++++++---
 wcs/wf/export_to_model.py | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

             return self.get_file().read()
     class UploadValidationError(Exception):
         pass
     class UploadWidget(CompositeWidget):
         def __init__(self, name, value=None, directory=None, filename=None,
                 validation=None, **kwargs):
-...
                 upload = self.get('file')
                 self.value = UploadedFile(self.directory, self.filename, upload)
                 if self.validation:
                     valid, msg = self.validation(upload)
                     if not valid:
                         self.error = msg
                     try:
                         self.validation(upload)
                     except UploadValidationError, e:
                         self.error = str(e)
             else:
                 self.value = None

     from qommon import ezt
     from qommon.form import (SingleSelectWidget, WidgetList, CheckboxWidget,
                              StringWidget, UploadWidget, WysiwygTextWidget, Upload,
                              UploadedFile)
                              UploadedFile, UploadValidationError)
     from qommon.errors import PublishError
     import qommon
-...
             elif hasattr(upload, 'get_file'):
                 fp = upload.get_file()
             else:
                 raise Exception('unknown upload %r' % upload)
                 raise UploadValidationError('unknown upload object %r' % upload)
             if upload.content_type and upload.content_type == 'application/rtf':
                 return 'rtf', ''
                 return 'rtf'
             if (upload.content_type and upload.content_type == 'application/octet-stream') or \
                     upload.content_type is None:
                 if upload.base_filename and upload.base_filename.endswith('.rtf'):
                     return 'rtf', ''
                     return 'rtf'
             if fp.read(10).startswith('{\\rtf'):
                 fp.seek(0)
                 return 'rtf', ''
                 return 'rtf'
             fp.seek(0)
             if upload.content_type and upload.content_type.startswith('application/vnd.oasis.opendocument.'):
                 return 'opendocument', ''
                 return 'opendocument'
             if (upload.content_type and upload.content_type == 'application/octet-stream') or \
                     upload.content_type is None:
                 if upload.base_filename and upload.base_filename.rsplit('.', 1) in ('odt', 'ods', 'odc', 'odb'):
                     return 'opendocument', ''
                     return 'opendocument'
             if is_opendocument(fp):
                 return 'opendocument', ''
             return False, _('Only RTF and OpenDocument files can be used')
                 return 'opendocument'
             raise UploadValidationError(_('Only RTF and OpenDocument files can be used'))
         def add_parameters_widgets(self, form, parameters, prefix='',
                                    formdef=None):
-...
         def apply_template_to_formdata(self, formdata):
             assert self.model_file
             kind, msg = self.model_file_validation(self.model_file)
             kind = self.model_file_validation(self.model_file)
             if kind == 'rtf':
                 return self.apply_rtf_template_to_formdata(formdata)
             elif kind == 'opendocument':
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0004-change-signature-for-UploadWidget.validation-paramet.patch