SCons: Apply new ruff/mypy fixes

This commit is contained in:
Thaddeus Crews 2025-02-03 09:55:09 -06:00
parent f60f69aa57
commit 382c760ea6
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
6 changed files with 29 additions and 31 deletions

View file

@ -7,7 +7,7 @@ import re
import subprocess
import sys
from collections import OrderedDict
from io import StringIO, TextIOWrapper
from io import StringIO, TextIOBase
from pathlib import Path
from typing import Generator, List, Optional, Union, cast
@ -1201,7 +1201,7 @@ def generate_vs_project(env, original_args, project_name="godot"):
vsconf = ""
for a in vs_configuration["arches"]:
if arch == a["architecture"]:
vsconf = f'{target}|{a["platform"]}'
vsconf = f"{target}|{a['platform']}"
break
condition = "'$(GodotConfiguration)|$(GodotPlatform)'=='" + vsconf + "'"
@ -1217,7 +1217,7 @@ def generate_vs_project(env, original_args, project_name="godot"):
properties.append(
"<ActiveProjectItemList_%s>;%s;</ActiveProjectItemList_%s>" % (x, ";".join(itemlist[x]), x)
)
output = f'bin\\godot{env["PROGSUFFIX"]}'
output = f"bin\\godot{env['PROGSUFFIX']}"
with open("misc/msvs/props.template", "r", encoding="utf-8") as file:
props_template = file.read()
@ -1453,7 +1453,7 @@ def generated_wrapper(
guard: Optional[bool] = None,
prefix: str = "",
suffix: str = "",
) -> Generator[TextIOWrapper, None, None]:
) -> Generator[TextIOBase, None, None]:
"""
Wrapper class to automatically handle copyright headers and header guards
for generated scripts. Meant to be invoked via `with` statement similar to
@ -1475,8 +1475,7 @@ def generated_wrapper(
if isinstance(path, list):
if len(path) > 1:
print_warning(
"Attempting to use generated wrapper with multiple targets; "
f"will only use first entry: {path[0]}"
f"Attempting to use generated wrapper with multiple targets; will only use first entry: {path[0]}"
)
path = path[0]
if not hasattr(path, "get_abspath"):