[PATCH net] tools: ynl: avoid dict errors on older Python versions

[PATCH net] tools: ynl: avoid dict errors on older Python versions

[Jakub Kicinski]

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")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: donald.hunter@gmail.com

This is arguably not a fix, but those trying YNL on 6.4 will likely
appreciate not running into the problem.
---
 tools/net/ynl/lib/ynl.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py
index 39a2296c0003..7c7a54d6841c 100644
--- a/tools/net/ynl/lib/ynl.py
+++ b/tools/net/ynl/lib/ynl.py
@@ -578,8 +578,9 @@ genl_family_name_to_id = None
                         print('Unexpected message: ' + repr(gm))
                         continue
 
-                rsp.append(self._decode(gm.raw_attrs, op.attr_set.name)
-                           | gm.fixed_header_attrs)
+                rsp_msg = self._decode(gm.raw_attrs, op.attr_set.name)
+                rsp_msg.update(gm.fixed_header_attrs)
+                rsp.append(rsp_msg)
 
         if not rsp:
             return None
-- 
2.40.1

Re: [PATCH net] tools: ynl: avoid dict errors on older Python versions

[Simon Horman]

On Wed, May 24, 2023 at 10:07:12AM -0700, Jakub Kicinski wrote:
> 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")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Reviewed-by: Simon Horman <simon.horman@corigine.com>

Re: [PATCH net] tools: ynl: avoid dict errors on older Python versions

[Donald Hunter]

Jakub Kicinski <kuba@kernel.org> writes:

> 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")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: donald.hunter@gmail.com
>
> This is arguably not a fix, but those trying YNL on 6.4 will likely
> appreciate not running into the problem.

I just hit the issue on Ubuntu on a BF2 so thank you for getting a fix
out before me! Tested with ovs_datapath.

Reviewed-by: Donald Hunter <donald.hunter@gmail.com>
Tested-by: Donald Hunter <donald.hunter@gmail.com>

Re: [PATCH net] tools: ynl: avoid dict errors on older Python versions

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 24 May 2023 10:07:12 -0700 you wrote:
> 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'
> 
> [...]

Here is the summary with links:
  - [net] tools: ynl: avoid dict errors on older Python versions
    https://git.kernel.org/netdev/net/c/081e8df68199

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html