0004-formdata-make-LinkedFormdataSubstitutionProxy-work-i.patch

Benjamin Dauvergne, 28 novembre 2019 01:55

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

Subject: [PATCH 4/5] formdata: make LinkedFormdataSubstitutionProxy work in
 pickle-lazy mode

To fixup with previous commit.

 wcs/formdata.py           |  3 +++
 wcs/wf/create_formdata.py | 44 ++++++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 12 deletions(-)

             lazy = self.get_substitution_variables()
             del lazy['form']
             del lazy['attachments']
             del lazy['linked']
             d.update(lazy)
             d = copy.deepcopy(d)
-...
             from .qommon.substitution import CompatibilityNamesDict
             from wcs.variables import LazyFormData
             from wcs.workflows import AttachmentsSubstitutionProxy
             from wcs.wf.create_formdata import LinkedFormdataSubstitutionProxy
             variables = CompatibilityNamesDict({
                 'form': LazyFormData(self),
                 'attachments': AttachmentsSubstitutionProxy(self),
                 'linked': LinkedFormdataSubstitutionProxy(self),
             })
             if self.formdef.category:
                 variables.update(self.formdef.category.get_substitution_variables(minimal=minimal))

     class LazyLinkedFormData(object):
         __part = None
         def __init__(self, part):
             self.__part = part
         def __getattr__(self, name):
             if name.startswith('__'):
                 raise AttributeError(name)
             formdata = self.__part.formdata
             if formdata is not None:
                 return getattr(LazyFormData(self.__part.formdata), name)
-...
     class LinkedFormdataSubstitutionProxy(object):
         def __init__(self, parts):
             self.__parts = parts
             self.__formdatas = [(part.varname, part, LazyLinkedFormData(part)) for part in parts]
             self.__formdatas.reverse()
             self.__varnames = set(varname for varname, _1, _2 in self.__formdatas)
             self.__varname = None
         __varname = None
         def __init__(self, formdata):
             self.formdata = formdata
         @property
         def __parts(self):
             return [part for part in self.formdata.iter_evolution_parts()
                     if isinstance(part, LinkedFormdataEvolutionPart)]
         @property
         def __formdatas(self):
             formdatas = [(part.varname, part, LazyLinkedFormData(part)) for part in self.__parts]
             formdatas.reverse()
             return formdatas
         @property
         def __varnames(self):
             return set(varname for varname, _1, _2 in self.__formdatas)
         def __iter__(self):
             for varname, part, formdata in self.__formdatas:
             for varname, part, formdata in self.__formdatas or []:
                 if self.__varname is None or self.__varname == varname:
                     yield formdata
-...
             return list(self)[idx]
         def __getattr__(self, name):
             if self.__varname or name not in self.__varnames:
             if name.startswith('__'):
                 raise AttributeError(name)
             if self.__varname or name not in (self.__varnames or []):
                 try:
                     first = self[0]
                 except KeyError:
                 except IndexError:
                     raise AttributeError(name)
                 return getattr(first, name)
             elif name in self.__varnames:
             elif name in (self.__varnames or []):
                 new_sub = copy.copy(self)
                 new_sub.varname = name
                 return new_sub
-...
         @classmethod
         def get_substitution_variables(cls, formdata):
             return {
                 'linked': LinkedFormdataSubstitutionProxy(
                     [part for part in formdata.iter_evolution_parts() if isinstance(part, LinkedFormdataEvolutionPart)]),
                 'linked': LinkedFormdataSubstitutionProxy(formdata),
+            }
         @property
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0004-formdata-make-LinkedFormdataSubstitutionProxy-work-i.patch