[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/16] qapi/main: handle theoretical None-return from re.match()
From: |
Markus Armbruster |
Subject: |
[PULL 03/16] qapi/main: handle theoretical None-return from re.match() |
Date: |
Mon, 8 Feb 2021 14:58:33 +0100 |
From: John Snow <jsnow@redhat.com>
Mypy cannot understand that this match can never be None, so help it
along.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210201193747.2169670-4-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/main.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/qapi/main.py b/scripts/qapi/main.py
index 42517210b8..703e7ed1ed 100644
--- a/scripts/qapi/main.py
+++ b/scripts/qapi/main.py
@@ -23,6 +23,8 @@ from .visit import gen_visit
def invalid_prefix_char(prefix: str) -> Optional[str]:
match = re.match(r'([A-Za-z_.-][A-Za-z0-9_.-]*)?', prefix)
+ # match cannot be None, but mypy cannot infer that.
+ assert match is not None
if match.end() != len(prefix):
return prefix[match.end()]
return None
--
2.26.2
- [PULL 00/16] QAPI patches patches for 2021-02-08, Markus Armbruster, 2021/02/08
- [PULL 04/16] qapi/gen: inline _wrap_ifcond into end_if(), Markus Armbruster, 2021/02/08
- [PULL 02/16] qapi/events: fix visit_event typing, Markus Armbruster, 2021/02/08
- [PULL 12/16] qapi/gen: Support switching to another module temporarily, Markus Armbruster, 2021/02/08
- [PULL 01/16] qapi/commands: assert arg_type is not None, Markus Armbruster, 2021/02/08
- [PULL 13/16] qapi/commands: Simplify command registry generation, Markus Armbruster, 2021/02/08
- [PULL 07/16] qapi: use explicitly internal module names, Markus Armbruster, 2021/02/08
- [PULL 03/16] qapi/main: handle theoretical None-return from re.match(),
Markus Armbruster <=
- [PULL 06/16] qapi/gen: Replace ._begin_system_module(), Markus Armbruster, 2021/02/08
- [PULL 05/16] qapi: centralize is_[user|system|builtin]_module methods, Markus Armbruster, 2021/02/08
- [PULL 16/16] qapi: enable strict-optional checks, Markus Armbruster, 2021/02/08
- [PULL 11/16] qapi/gen: write _genc/_genh access shims, Markus Armbruster, 2021/02/08
- [PULL 15/16] qapi: type 'info' as Optional[QAPISourceInfo], Markus Armbruster, 2021/02/08
- [PULL 10/16] qapi: centralize the built-in module name definition, Markus Armbruster, 2021/02/08
- [PULL 14/16] qapi/gen: Drop support for QAPIGen without a file name, Markus Armbruster, 2021/02/08
- [PULL 09/16] qapi/gen: Combine ._add_[user|system]_module, Markus Armbruster, 2021/02/08
- [PULL 08/16] qapi: use './builtin' as the built-in module name, Markus Armbruster, 2021/02/08
- Re: [PULL 00/16] QAPI patches patches for 2021-02-08, Peter Maydell, 2021/02/08