From 4a28930c0d163b7ccfbf60879b0789a3adfb20c2 Mon Sep 17 00:00:00 2001 From: Jean Cavallo Date: Mon, 25 Mar 2024 17:35:45 +0100 Subject: [PATCH] gtk: Force py38 compatibility [CUSTOM] --- tryton/tryton/gui/window/view_form/model/field.py | 6 +++--- tryton/tryton/gui/window/view_form/model/record.py | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tryton/tryton/gui/window/view_form/model/field.py b/tryton/tryton/gui/window/view_form/model/field.py index 9e1b6adf624..eec53aa1db2 100644 --- a/tryton/tryton/gui/window/view_form/model/field.py +++ b/tryton/tryton/gui/window/view_form/model/field.py @@ -753,7 +753,7 @@ def _set_value( if (f not in group.fields and '.' not in f and not f.startswith('_'))} attr_fields = functools.reduce( - operator.or_, + lambda a, b: a.update(b) or a, (v['fields'] for v in self.attrs.get('views', {}).values()), {}) fields = {n: attr_fields[n] @@ -762,8 +762,8 @@ def _set_value( to_fetch = field_names - attr_fields.keys() if to_fetch: try: - fields |= RPCExecute('model', self.attrs['relation'], - 'fields_get', list(to_fetch), context=context) + fields.update(RPCExecute('model', self.attrs['relation'], + 'fields_get', list(to_fetch), context=context)) except RPCException: return diff --git a/tryton/tryton/gui/window/view_form/model/record.py b/tryton/tryton/gui/window/view_form/model/record.py index 826af3667b5..7e800020576 100644 --- a/tryton/tryton/gui/window/view_form/model/record.py +++ b/tryton/tryton/gui/window/view_form/model/record.py @@ -2,7 +2,6 @@ # this repository contains the full copyright notices and license terms. import functools import logging -import operator import tryton.common as common from tryton.common import RPCException, RPCExecute @@ -17,7 +16,7 @@ def get_x2m_sub_fields(f_attrs, prefix): if f_attrs['loading'] == 'eager' and f_attrs.get('views'): sub_fields = functools.reduce( - operator.or_, + lambda a, b: a.update(b) or a, (v.get('fields', {}) for v in f_attrs['views'].values()), {}) x2m_sub_fields = []