]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
qapi: Add minor typing workaround for 3.6
authorJohn Snow <jsnow@redhat.com>
Wed, 15 Feb 2023 00:00:08 +0000 (19:00 -0500)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 23 Feb 2023 12:01:14 +0000 (13:01 +0100)
Pylint under 3.6 does not believe that Collection is subscriptable at
runtime. It is, making this a Pylint
bug. https://github.com/PyCQA/pylint/issues/2377

They closed it as fixed, but that doesn't seem to be true as of Pylint
2.13.9, the latest version you can install under Python 3.6. 2.13.9 was
released 2022-05-13, about seven months after the bug was closed.

The least-annoying fix here is to just use the concret type.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20230215000011.1725012-4-jsnow@redhat.com>
[Dumbed down from Sequence[str] to List[str], commit message adjusted]
Reviewed-by: Markus Armbruster <armbru@redhat.com>
scripts/qapi/expr.py

index 5a1782b57eaee8251f832ab8578cd947ba961f8b..358b8e2a8b447b10477e02908ae33c6ea7d56453 100644 (file)
@@ -33,7 +33,6 @@ structures and contextual semantic validation.
 
 import re
 from typing import (
-    Collection,
     Dict,
     Iterable,
     List,
@@ -195,8 +194,8 @@ def check_defn_name_str(name: str, info: QAPISourceInfo, meta: str) -> None:
 def check_keys(value: _JSONObject,
                info: QAPISourceInfo,
                source: str,
-               required: Collection[str],
-               optional: Collection[str]) -> None:
+               required: List[str],
+               optional: List[str]) -> None:
     """
     Ensure that a dict has a specific set of keys.