diff mbox series

[v5,21/36] qapi/commands.py: Don't re-bind to variable of different type

Message ID 20201005195158.2348217-22-jsnow@redhat.com
State Superseded
Headers show
Series qapi: static typing conversion, pt1 | expand

Commit Message

John Snow Oct. 5, 2020, 7:51 p.m. UTC
Mypy isn't a fan of rebinding a variable with a new data type.
It's easy enough to avoid.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
---
 scripts/qapi/commands.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Markus Armbruster Oct. 7, 2020, 11:34 a.m. UTC | #1
John Snow <jsnow@redhat.com> writes:

> Mypy isn't a fan of rebinding a variable with a new data type.

> It's easy enough to avoid.

>

> Signed-off-by: John Snow <jsnow@redhat.com>

> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

> Reviewed-by: Cleber Rosa <crosa@redhat.com>

> ---

>  scripts/qapi/commands.py | 4 +---

>  1 file changed, 1 insertion(+), 3 deletions(-)

>

> diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py

> index f67393f8713..586774a23c7 100644

> --- a/scripts/qapi/commands.py

> +++ b/scripts/qapi/commands.py

> @@ -195,14 +195,12 @@ def gen_register_command(name, success_response, allow_oob, allow_preconfig):

>      if not options:

>          options = ['QCO_NO_OPTIONS']

>  

> -    options = " | ".join(options)

> -

>      ret = mcgen('''

>      qmp_register_command(cmds, "%(name)s",

>                           qmp_marshal_%(c_name)s, %(opts)s);

>  ''',

>                  name=name, c_name=c_name(name),

> -                opts=options)

> +                opts=" | ".join(options))

>      return ret


Definitely neater.

Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff mbox series

Patch

diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index f67393f8713..586774a23c7 100644
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -195,14 +195,12 @@  def gen_register_command(name, success_response, allow_oob, allow_preconfig):
     if not options:
         options = ['QCO_NO_OPTIONS']
 
-    options = " | ".join(options)
-
     ret = mcgen('''
     qmp_register_command(cmds, "%(name)s",
                          qmp_marshal_%(c_name)s, %(opts)s);
 ''',
                 name=name, c_name=c_name(name),
-                opts=options)
+                opts=" | ".join(options))
     return ret