tools: ynl: avoid dict errors on older Python versions
authorJakub Kicinski <kuba@kernel.org>
Wed, 24 May 2023 17:07:12 +0000 (10:07 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 26 May 2023 04:02:43 +0000 (21:02 -0700)
commit081e8df6819997eae236f75dd52f0c147c4be939
tree7c3a6a8e20904c1c955b385a1b2ddbeb8ccbf1d7
parent31642e7089df8fd3f54ca7843f7ee2952978cad1
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: f036d936ca57 ("tools: ynl: Add fixed-header support to ynl")
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Donald Hunter <donald.hunter@gmail.com>
Tested-by: Donald Hunter <donald.hunter@gmail.com>
Link: https://lore.kernel.org/r/20230524170712.2036128-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/net/ynl/lib/ynl.py