Commit 081e8df6 authored by Jakub Kicinski's avatar Jakub Kicinski

tools: ynl: avoid dict errors on older Python versions

Python 3.9.0 or newer supports combining dicts() with |,
but older versions of Python are still used in the wild
(e.g. on CentOS 8, which goes EoL May 31, 2024).
With Python 3.6.8 we get:

  TypeError: unsupported operand type(s) for |: 'dict' and 'dict'

Use older syntax. Tested with non-legacy families only.

Fixes: f036d936 ("tools: ynl: Add fixed-header support to ynl")
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Tested-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Link: https://lore.kernel.org/r/20230524170712.2036128-1-kuba@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 31642e70
...@@ -591,8 +591,9 @@ class YnlFamily(SpecFamily): ...@@ -591,8 +591,9 @@ class YnlFamily(SpecFamily):
print('Unexpected message: ' + repr(gm)) print('Unexpected message: ' + repr(gm))
continue continue
rsp.append(self._decode(gm.raw_attrs, op.attr_set.name) rsp_msg = self._decode(gm.raw_attrs, op.attr_set.name)
| gm.fixed_header_attrs) rsp_msg.update(gm.fixed_header_attrs)
rsp.append(rsp_msg)
if not rsp: if not rsp:
return None return None
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment