Siklos/blueprint-compiler
1
0
Fork 0
mirror of https://gitlab.gnome.org/jwestman/blueprint-compiler.git synced 2025-05-05 16:09:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support Python 3.9

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

6
blueprintcompiler/outputs/xml/__init__.py
View file

@ -1,3 +1,5 @@
import typing as T
from .. import OutputFormat
from ...language import *
from .xml_emitter import XmlEmitter
@ -45,7 +47,7 @@ class XmlOutput(OutputFormat):
self._emit_object_or_template(obj, xml)
xml.end_tag()
def _emit_object_or_template(self, obj: Object | Template, xml: XmlEmitter):
def _emit_object_or_template(self, obj: T.Union[Object, Template], xml: XmlEmitter):
for child in obj.content.children:
if isinstance(child, Property):
self._emit_property(child, xml)
@ -123,7 +125,7 @@ class XmlOutput(OutputFormat):
def _translated_string_attrs(
self, translated: TranslatedStringValue
) -> T.Dict[str, str | None]:
) -> T.Dict[str, T.Optional[str]]:
return {
"translatable": "true",
"context": translated.context,

6
blueprintcompiler/outputs/xml/xml_emitter.py
View file

@ -17,6 +17,8 @@
#
# SPDX-License-Identifier: LGPL-3.0-or-later
import typing as T
from xml.sax import saxutils
from blueprintcompiler.gir import GirType
@ -30,7 +32,7 @@ class XmlEmitter:
self._tag_stack = []
self._needs_newline = False
def start_tag(self, tag, **attrs: str | GirType | ClassName | bool | None):
def start_tag(self, tag, **attrs: T.Union[str, GirType, ClassName, bool, None]):
self._indent()
self.result += f"<{tag}"
for key, val in attrs.items():
@ -56,7 +58,7 @@ class XmlEmitter:
self.result += f"</{tag}>"
self._needs_newline = True
def put_text(self, text: str | int | float):
def put_text(self, text: T.Union[str, int, float]):
self.result += saxutils.escape(str(text))
self._needs_newline = False