Support Python 3.9

Remove the '|' syntax for type unions, since it's a 3.10 feature, and
set mypy to check with version 3.9.
This commit is contained in:
James Westman 2022-10-27 13:15:58 -05:00
parent d6c6a66c15
commit 0b8012b8e1
No known key found for this signature in database
GPG key ID: CE2DBA0ADB654EA6
7 changed files with 18 additions and 11 deletions

View file

@ -45,7 +45,7 @@ class Object(AstNode):
return self.tokens["id"]
@property
def class_name(self) -> ClassName | None:
def class_name(self) -> T.Optional[ClassName]:
return self.children[ClassName][0]
@property

View file

@ -17,6 +17,7 @@
#
# SPDX-License-Identifier: LGPL-3.0-or-later
import typing as T
from .gtkbuilder_template import Template
from .common import *
@ -45,7 +46,7 @@ class Signal(AstNode):
return self.tokens["name"]
@property
def detail_name(self) -> str | None:
def detail_name(self) -> T.Optional[str]:
return self.tokens["detail_name"]
@property
@ -53,7 +54,7 @@ class Signal(AstNode):
return self.tokens["handler"]
@property
def object_id(self) -> str | None:
def object_id(self) -> T.Optional[str]:
return self.tokens["object"]
@property

View file

@ -17,6 +17,7 @@
#
# SPDX-License-Identifier: LGPL-3.0-or-later
import typing as T
from .gobject_object import Object, ObjectContent
from .common import *
@ -39,7 +40,7 @@ class Template(Object):
return self.tokens["id"]
@property
def class_name(self) -> ClassName | None:
def class_name(self) -> T.Optional[ClassName]:
if len(self.children[ClassName]):
return self.children[ClassName][0]
else:

View file

@ -17,6 +17,7 @@
#
# SPDX-License-Identifier: LGPL-3.0-or-later
import typing as T
from .common import *
from .types import TypeName
@ -50,7 +51,7 @@ class TranslatedStringValue(Value):
return self.tokens["value"]
@property
def context(self) -> str | None:
def context(self) -> T.Optional[str]:
return self.tokens["context"]
@ -116,7 +117,7 @@ class NumberValue(Value):
grammar = UseNumber("value")
@property
def value(self) -> int | float:
def value(self) -> T.Union[int, float]:
return self.tokens["value"]
@validate()