0002-wf-mark-direct-usage-of-attachments-as-deprecated-56.patch

Lauréline Guérin, 06 septembre 2021 16:23

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

Subject: [PATCH 2/2] wf: mark direct usage of "attachments" as deprecated
 (#56613)

 tests/test_workflows.py | 40 +++++++++++++++++++++++++++++++---------
 wcs/formdata.py         |  2 +-
 wcs/workflows.py        |  8 ++++++--
 3 files changed, 38 insertions(+), 12 deletions(-)

         assert formdata.evolution[-1].display_parts()[-1] == '<div><p>hello</p></div>'
     def test_register_comment_attachment(pub):
         pub.substitutions.feed(MockSubstitutionVariables())
     def test_register_comment_attachment(two_pubs):
         if two_pubs.is_using_postgresql():
             two_pubs.loggederror_class.wipe()
         two_pubs.substitutions.feed(MockSubstitutionVariables())
         formdef = FormDef()
         formdef.name = 'baz'
-...
         item.comment = '{{ attachments.testfile.url }}'
         pub.substitutions.feed(formdata)
         two_pubs.substitutions.feed(formdata)
         item.perform(formdata)
         url1 = formdata.evolution[-1].parts[-1].content
         if two_pubs.is_using_postgresql():
             assert two_pubs.loggederror_class.count() == 1
             error = two_pubs.loggederror_class.select()[0]
             assert error.kind == 'deprecated_usage'
             assert error.occurences_count == 1
         pub.substitutions.feed(formdata)
         two_pubs.substitutions.feed(formdata)
         item.comment = '{{ form_attachments.testfile.url }}'
         item.perform(formdata)
         url2 = formdata.evolution[-1].parts[-1].content
         if two_pubs.is_using_postgresql():
             assert two_pubs.loggederror_class.count() == 1
             error = two_pubs.loggederror_class.select()[0]
             assert error.kind == 'deprecated_usage'
             assert error.occurences_count == 1
         assert len(os.listdir(os.path.join(get_publisher().app_dir, 'attachments'))) == 1
         for subdir in os.listdir(os.path.join(get_publisher().app_dir, 'attachments')):
-...
         item.condition = {'type': 'django', 'value': 'form_attachments.missing'}
         assert item.check_condition(formdata) is False
         pub.substitutions.feed(formdata)
         two_pubs.substitutions.feed(formdata)
         item.comment = '[attachments.testfile.url]'
         item.perform(formdata)
         url3 = formdata.evolution[-1].parts[-1].content
         pub.substitutions.feed(formdata)
         if two_pubs.is_using_postgresql():
             assert two_pubs.loggederror_class.count() == 1
             error = two_pubs.loggederror_class.select()[0]
             assert error.kind == 'deprecated_usage'
             assert error.occurences_count == 2
         two_pubs.substitutions.feed(formdata)
         item.comment = '[form_attachments.testfile.url]'
         item.perform(formdata)
         url4 = formdata.evolution[-1].parts[-1].content
         assert url3 == url4
         if two_pubs.is_using_postgresql():
             assert two_pubs.loggederror_class.count() == 1
             error = two_pubs.loggederror_class.select()[0]
             assert error.kind == 'deprecated_usage'
             assert error.occurences_count == 2
     def test_register_comment_with_attachment_file(pub):
-...
         item.url = 'http://remote.example.net'
         item.request_signature_key = '{{ doesntexist }}'
         item.perform(formdata)
         assert not 'signature=' in http_requests.get_last('url')
         assert 'signature=' not in http_requests.get_last('url')
         item = WebserviceCallStatusItem()
         item.url = 'http://remote.example.net'
         item.request_signature_key = '{{ empty }}'
         item.perform(formdata)
         assert not 'signature=' in http_requests.get_last('url')
         assert 'signature=' not in http_requests.get_last('url')
         item = WebserviceCallStatusItem()
         item.url = 'http://remote.example.net'
         item.request_signature_key = '[empty]'
         item.perform(formdata)
         assert not 'signature=' in http_requests.get_last('url')
         assert 'signature=' not in http_requests.get_last('url')
         item = WebserviceCallStatusItem()
         item.url = 'http://remote.example.net'

wcs/formdata.py
950	950	variables = CompatibilityNamesDict(
951	951	{
952	952	'form': self.get_as_lazy(),
953		'attachments': AttachmentsSubstitutionProxy(self),
	953	'attachments': AttachmentsSubstitutionProxy(self, deprecated_usage=True),
954	954	}
955	955	)
956	956	if self.formdef.category:

     class AttachmentsSubstitutionProxy:
         def __init__(self, formdata):
         def __init__(self, formdata, deprecated_usage=False):
             self.formdata = formdata
             self.deprecated_usage = deprecated_usage
         def __getattr__(self, name):
             if name.startswith('__'):
-...
             parts = [part for part in self.formdata.iter_evolution_parts() if has_varname_attachment(part)]
             if parts:
                 if self.deprecated_usage:
                     error_summary = _('Usage of "attachments" detected in "attachments_%s" expression') % name
                     get_publisher().record_deprecated_usage(error_summary, formdata=self.formdata)
                 return NamedAttachmentsSubstitutionProxy(self.formdata, parts)
             raise AttributeError(name)
-...
         @classmethod
         def get_substitution_variables(cls, formdata):
             return {
                 'attachments': AttachmentsSubstitutionProxy(formdata),
                 'attachments': AttachmentsSubstitutionProxy(formdata, deprecated_usage=True),
                 'form_attachments': AttachmentsSubstitutionProxy(formdata),
+            }
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0002-wf-mark-direct-usage-of-attachments-as-deprecated-56.patch