0001-general-don-t-flatten-to-invalid-keys-52579.patch

Frédéric Péters, 12 avril 2021 20:41

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

Subject: [PATCH] general: don't flatten to invalid keys (#52579)

 tests/backoffice_pages/test_all.py | 10 ++++++++++
 tests/test_formdata.py             | 18 ++++++++++++++++++
 wcs/backoffice/management.py       | 10 ++++++++--
 wcs/formdata.py                    |  6 ++----
 wcs/qommon/substitution.py         |  8 +++++++-
 5 files changed, 45 insertions(+), 7 deletions(-)

         assert 'form_user_f3' not in resp.text
         assert 'form_user_f_' not in resp.text
         # make sure workflow data itself is not displayed, as it's available in
         # expanded variables
         assert not pq('[title="form_workflow_data"]')
         # but do display it if it has some invalid contents
         formdata.workflow_data['invalid key'] = 'foobar'
         formdata.store()
         resp = login(get_app(pub)).get(resp.request.url)
         assert resp.pyquery('[title="form_workflow_data"]')
         # check functions
         assert re.findall('Recipient.*foobar', resp.text)

         assert substvars['foo_var_file_url']
     def test_workflow_data_invalid_keys(pub, formdef):
         formdata = formdef.data_class()()
         formdata.store()
         formdata.workflow_data = {
             'valid_key': {'invalid key': 'foo', 'valid_key': 'bar'},
             'invalid key': 'baz',
+        }
         substvars = formdata.get_substitution_variables()
         assert 'form_workflow_data_valid_key' in substvars
         assert 'form_workflow_data_invalid key' not in substvars
         assert 'form_workflow_data_valid_key_valid_key' in substvars
         assert 'form_workflow_data_valid_key_invalid key' not in substvars
         assert substvars['form_workflow_data_valid_key_valid_key'] == 'bar'
         with pytest.raises(KeyError):
             # noqa pylint: disable=pointless-statement
             substvars['form_workflow_data_invalid key']
     def test_evolution_get_status(pub):
         Workflow.wipe()
         workflow = Workflow(name='test')

                         'inspect_url': v['form'].backoffice_url + 'inspect',
                         'display_name': v['form_display_name'],
+                    }
                 elif hasattr(v, 'inspect_keys') or isinstance(v, dict):
                     # skip expanded
                 elif hasattr(v, 'inspect_keys'):
                     # skip as there are expanded identifiers
                     continue
                 else:
                     if isinstance(v, dict):
                         # only display dictionaries if they have invalid keys
                         # (otherwise the expanded identifiers are a better way
                         # to get to the values).
                         if all(CompatibilityNamesDict.valid_key_regex.match(k) for k in v):
                             continue
                     r += htmltext('<li><code title="%s">%s</code>') % (k, k)
                     r += htmltext('  <div class="value"><span>%s</span>') % ellipsize(safe(v), 10000)
                     if not isinstance(v, str):

     from .qommon.evalutils import make_datetime
     from .qommon.publisher import get_cfg
     from .qommon.storage import Contains, Intersects, Null, StorableObject
     from .qommon.substitution import Substitutions, invalidate_substitution_cache
     from .qommon.substitution import CompatibilityNamesDict, Substitutions, invalidate_substitution_cache
     from .qommon.template import Template
-...
         def get_substitution_variables(self, minimal=False):
             from wcs.workflows import AttachmentsSubstitutionProxy
             from .qommon.substitution import CompatibilityNamesDict
             variables = CompatibilityNamesDict(
+                {
                     'form': self.get_as_lazy(),
-...
                 d = copy.deepcopy(d)
                 flatten_dict(d)
                 variables.update(d)
                 variables.update({k: v for k, v in d.items() if CompatibilityNamesDict.valid_key_regex.match(k)})
             return variables

     # You should have received a copy of the GNU General Public License
     # along with this program; if not, see <http://www.gnu.org/licenses/>.
     import re
     from contextlib import contextmanager
     from quixote import get_publisher
-...
     class CompatibilityNamesDict(dict):
         # custom dictionary that provides automatic fallback to legacy variable
         # names (namespaced with underscores)
         valid_key_regex = re.compile(r'^[a-zA-Z][a-zA-Z0-9_]*$')
         def get(self, key, default=None):
             try:
                 return self.__getitem__(key)
-...
                 if hasattr(item, 'inspect_keys'):
                     sub_keys = item.inspect_keys()
                 elif isinstance(item, dict):
                     sub_keys = item.keys()
                     sub_keys = [x for x in item.keys() if self.valid_key_regex.match(x)]
                 else:
                     return
                 for sub_key in sub_keys:
-...
             raise KeyError
         def __getitem__(self, key):
             if not self.valid_key_regex.match(key):
                 raise KeyError(key)
             parts = key.split('_')
             try:
                 return self.get_path(self, parts)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-general-don-t-flatten-to-invalid-keys-52579.patch