Re: [PULL 5/5] qapi/parser: Drop two bad type hints for now

[Richard Henderson]

On 5/17/23 08:25, Markus Armbruster wrote:
> Two type hints fail centos-stream-8-x86_64 CI.  They are actually
> broken.  Changing them to Optional[re.Match[str]] fixes them locally
> for me, but then CI fails differently.  Drop them for now.
>
> Fixes: 3e32dca3f0d1 (qapi: Rewrite parsing of doc comment section symbols and 
> tags)
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Message-Id: <20230517061600.1782455-1-armbru@redhat.com>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Tested-by: Igor Mammedov <imammedo@redhat.com>
> ---
>   scripts/qapi/parser.py | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
> index acd43cd7e1..22e7bcc4b1 100644
> --- a/scripts/qapi/parser.py
> +++ b/scripts/qapi/parser.py
> @@ -563,11 +563,11 @@ def end_comment(self) -> None:
>           self._switch_section(QAPIDoc.NullSection(self._parser))
>   
>       @staticmethod
> -    def _match_at_name_colon(string: str) -> re.Match:
> +    def _match_at_name_colon(string: str):
>           return re.match(r'@([^:]*): *', string)
>   
>       @staticmethod
> -    def _match_section_tag(string: str) -> re.Match:
> +    def _match_section_tag(string: str):
>           return re.match(r'(Returns|Since|Notes?|Examples?|TODO): *', string)
>   
>       def _append_body_line(self, line: str) -> None:

I am going to cherry-pick this patch into master, since the build
did succeed sufficiently to show that it fixes the centos-8-stream job.


r~