0001-misc-allow-lazy-fields-to-be-used-for-attachments-41.patch

Frédéric Péters, 08 avril 2020 13:44

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

Subject: [PATCH] misc: allow lazy fields to be used for attachments (#41451)

 tests/test_fields.py | 39 ++++++++++++++++++++++++++++++++++++++-
 wcs/fields.py        |  3 +++
 wcs/variables.py     |  6 ++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

     from wcs.qommon.http_request import HTTPRequest
     from wcs.qommon import sessions
     from wcs import fields
     from wcs.qommon.form import Form
     from wcs.qommon.form import Form, PicklableUpload
     from wcs.formdef import FormDef
     from wcs.variables import LazyFormData
     from utilities import create_temporary_pub, MockSubstitutionVariables
-...
         assert fields.DateField().convert_value_from_str('04/01/2015') is not None
         assert fields.DateField().convert_value_from_str('') is None
         assert fields.DateField().convert_value_from_str('not a date') is None
     def test_file_convert_from_anything():
         assert fields.FileField().convert_value_from_anything(None) is None
         value = fields.FileField().convert_value_from_anything(
                 {'content': 'hello', 'filename': 'test.txt'})
         assert value.base_filename == 'test.txt'
         assert value.get_file_pointer().read() == b'hello'
         value = fields.FileField().convert_value_from_anything(
                 {'b64_content': 'aGVsbG8=', 'filename': 'test.txt'})
         assert value.base_filename == 'test.txt'
         assert value.get_file_pointer().read() == b'hello'
         formdef = FormDef()
         formdef.name = 'foobarlazy'
         formdef.fields = [fields.FileField(id='5', label='file', varname='filefield')]
         formdef.store()
         formdef.data_class().wipe()
         formdata = formdef.data_class()()
         formdata.data = {
             '5': PicklableUpload('test.txt', 'text/plain'),
+        }
         formdata.data['5'].receive([b'hello'])
         formdata.store()
         value = fields.FileField().convert_value_from_anything(
                 formdef.data_class().get(formdata.id).data['5'])
         assert value.base_filename == 'test.txt'
         assert value.get_file_pointer().read() == b'hello'
         value = fields.FileField().convert_value_from_anything(
                 LazyFormData(formdef.data_class().get(formdata.id)).var.filefield)
         assert value.base_filename == 'test.txt'
         assert value.get_file_pointer().read() == b'hello'

         def convert_value_from_anything(cls, value):
             if value is None:
                 return None
             from wcs.variables import LazyFieldVarFile
             if isinstance(value, LazyFieldVarFile):
                 value = value.get_value()  # unbox
             if hasattr(value, 'base_filename'):
                 upload = PicklableUpload(value.base_filename,
                                          value.content_type or 'application/octet-stream')

                 return LazyFieldVarMap(self._data, field, self._formdata)
             if field.key == 'password':
                 return LazyFieldVarPassword(self._data, field, self._formdata)
             if field.key == 'file':
                 return LazyFieldVarFile(self._data, field, self._formdata)
             if field.store_structured_value:
                 return LazyFieldVarStructured(self._data, field, self._formdata)
-...
             return super(LazyFieldVarPassword, self)._getitem__(key)
     class LazyFieldVarFile(LazyFieldVar):
         pass
     class LazyUser(object):
         def __init__(self, user):
             self._user = user
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-allow-lazy-fields-to-be-used-for-attachments-41.patch