Merge pull request #90457 from Chubercik/ruff-formatter

Replace `black` formatter with `ruff`

8 files changed, 75 insertions, 80 deletions

diff --git a/modules/SCsub b/modules/SCsub
index 739c5de0b5..db0e563dc4 100644
--- a/modules/SCsub
+++ b/modules/SCsub
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-import methods
 import os
 
+import methods
+
 Import("env")
 
 env_modules = env.Clone()
diff --git a/modules/mono/build_scripts/build_assemblies.py b/modules/mono/build_scripts/build_assemblies.py
index f9709362eb..efbf298f99 100755
--- a/modules/mono/build_scripts/build_assemblies.py
+++ b/modules/mono/build_scripts/build_assemblies.py
@@ -5,7 +5,7 @@ import os.path
 import shlex
 import subprocess
 from dataclasses import dataclass
-from typing import Optional, List
+from typing import List, Optional
 
 
 def find_dotnet_cli():
@@ -304,9 +304,7 @@ def generate_sdk_package_versions():
     <GodotVersionConstants>{1}</GodotVersionConstants>
   </PropertyGroup>
 </Project>
-""".format(
-        version_str, ";".join(version_defines)
-    )
+""".format(version_str, ";".join(version_defines))
 
     # We write in ../SdkPackageVersions.props.
     with open(os.path.join(dirname(script_path), "SdkPackageVersions.props"), "w", encoding="utf-8", newline="\n") as f:
@@ -323,9 +321,7 @@ def generate_sdk_package_versions():
         public const string VersionDocsUrl = "https://docs.godotengine.org/en/{docs_branch}";
     }}
 }}
-""".format(
-        **version_info
-    )
+""".format(**version_info)
 
     generators_dir = os.path.join(
         dirname(script_path),
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py
index e5469c4980..98c50dcc22 100644
--- a/modules/mono/build_scripts/mono_configure.py
+++ b/modules/mono/build_scripts/mono_configure.py
@@ -1,7 +1,3 @@
-import os
-import os.path
-
-
 def is_desktop(platform):
     return platform in ["windows", "macos", "linuxbsd"]
 
diff --git a/modules/mono/config.py b/modules/mono/config.py
index 3d087c9e27..5ebdb83b36 100644
--- a/modules/mono/config.py
+++ b/modules/mono/config.py
@@ -12,7 +12,7 @@ def configure(env):
     # Check if the platform has marked mono as supported.
     supported = env.get("supported", [])
 
-    if not "mono" in supported:
+    if "mono" not in supported:
         raise RuntimeError("This module does not currently support building for this platform")
 
     env.add_module_version_string("mono")
diff --git a/modules/text_server_adv/gdextension_build/SConstruct b/modules/text_server_adv/gdextension_build/SConstruct
index 58e1868e31..2f7a175d91 100644
--- a/modules/text_server_adv/gdextension_build/SConstruct
+++ b/modules/text_server_adv/gdextension_build/SConstruct
@@ -1,14 +1,15 @@
 #!/usr/bin/env python
 import atexit
 import sys
-import methods
 import time
 
+import methods
+
 # Enable ANSI escape code support on Windows 10 and later (for colored console output).
 # <https://github.com/python/cpython/issues/73245>
 if sys.stdout.isatty() and sys.platform == "win32":
     try:
-        from ctypes import windll, byref, WinError  # type: ignore
+        from ctypes import WinError, byref, windll  # type: ignore
         from ctypes.wintypes import DWORD  # type: ignore
 
         stdout_handle = windll.kernel32.GetStdHandle(DWORD(-11))
@@ -720,7 +721,7 @@ if env["static_icu_data"]:
     env.Append(CXXFLAGS=["-DICU_STATIC_DATA"])
     env.Append(CPPPATH=["../../../thirdparty/icu4c/"])
 else:
-    thirdparty_sources += ["../icu_data/icudata_stub.cpp"]
+    thirdparty_icu_sources += ["../icu_data/icudata_stub.cpp"]
 
 env_icu.Append(CPPPATH=["../../../thirdparty/icu4c/common/", "../../../thirdparty/icu4c/i18n/"])
 env_icu.Append(
diff --git a/modules/text_server_adv/gdextension_build/methods.py b/modules/text_server_adv/gdextension_build/methods.py
index 3453c3e8f0..43bf56abfe 100644
--- a/modules/text_server_adv/gdextension_build/methods.py
+++ b/modules/text_server_adv/gdextension_build/methods.py
@@ -81,9 +81,9 @@ def disable_warnings(self):
         self.Append(CCFLAGS=["/w"])
         self.Append(CFLAGS=["/w"])
         self.Append(CXXFLAGS=["/w"])
-        self["CCFLAGS"] = [x for x in self["CCFLAGS"] if not x in warn_flags]
-        self["CFLAGS"] = [x for x in self["CFLAGS"] if not x in warn_flags]
-        self["CXXFLAGS"] = [x for x in self["CXXFLAGS"] if not x in warn_flags]
+        self["CCFLAGS"] = [x for x in self["CCFLAGS"] if x not in warn_flags]
+        self["CFLAGS"] = [x for x in self["CFLAGS"] if x not in warn_flags]
+        self["CXXFLAGS"] = [x for x in self["CXXFLAGS"] if x not in warn_flags]
     else:
         self.Append(CCFLAGS=["-w"])
         self.Append(CFLAGS=["-w"])
@@ -117,31 +117,31 @@ def make_icu_data(target, source, env):
 def write_macos_plist(target, binary_name, identifier, name):
     os.makedirs(f"{target}/Resource/", exist_ok=True)
     with open(f"{target}/Resource/Info.plist", "w", encoding="utf-8", newline="\n") as f:
-        f.write(f'<?xml version="1.0" encoding="UTF-8"?>\n')
-        f.write(
-            f'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n'
-        )
-        f.write(f'<plist version="1.0">\n')
-        f.write(f"<dict>\n")
-        f.write(f"\t<key>CFBundleExecutable</key>\n")
-        f.write(f"\t<string>{binary_name}</string>\n")
-        f.write(f"\t<key>CFBundleIdentifier</key>\n")
-        f.write(f"\t<string>{identifier}</string>\n")
-        f.write(f"\t<key>CFBundleInfoDictionaryVersion</key>\n")
-        f.write(f"\t<string>6.0</string>\n")
-        f.write(f"\t<key>CFBundleName</key>\n")
-        f.write(f"\t<string>{name}</string>\n")
-        f.write(f"\t<key>CFBundlePackageType</key>\n")
-        f.write(f"\t<string>FMWK</string>\n")
-        f.write(f"\t<key>CFBundleShortVersionString</key>\n")
-        f.write(f"\t<string>1.0.0</string>\n")
-        f.write(f"\t<key>CFBundleSupportedPlatforms</key>\n")
-        f.write(f"\t<array>\n")
-        f.write(f"\t\t<string>MacOSX</string>\n")
-        f.write(f"\t</array>\n")
-        f.write(f"\t<key>CFBundleVersion</key>\n")
-        f.write(f"\t<string>1.0.0</string>\n")
-        f.write(f"\t<key>LSMinimumSystemVersion</key>\n")
-        f.write(f"\t<string>10.14</string>\n")
-        f.write(f"</dict>\n")
-        f.write(f"</plist>\n")
+        f.write(f"""\
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>{binary_name}</string>
+	<key>CFBundleIdentifier</key>
+	<string>{identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>{name}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.14</string>
+</dict>
+</plist>
+""")
diff --git a/modules/text_server_fb/gdextension_build/SConstruct b/modules/text_server_fb/gdextension_build/SConstruct
index 9326a53026..f6ae7149be 100644
--- a/modules/text_server_fb/gdextension_build/SConstruct
+++ b/modules/text_server_fb/gdextension_build/SConstruct
@@ -1,14 +1,15 @@
 #!/usr/bin/env python
 import atexit
 import sys
-import methods
 import time
 
+import methods
+
 # Enable ANSI escape code support on Windows 10 and later (for colored console output).
 # <https://github.com/python/cpython/issues/73245>
 if sys.stdout.isatty() and sys.platform == "win32":
     try:
-        from ctypes import windll, byref, WinError  # type: ignore
+        from ctypes import WinError, byref, windll  # type: ignore
         from ctypes.wintypes import DWORD  # type: ignore
 
         stdout_handle = windll.kernel32.GetStdHandle(DWORD(-11))
diff --git a/modules/text_server_fb/gdextension_build/methods.py b/modules/text_server_fb/gdextension_build/methods.py
index 3453c3e8f0..43bf56abfe 100644
--- a/modules/text_server_fb/gdextension_build/methods.py
+++ b/modules/text_server_fb/gdextension_build/methods.py
@@ -81,9 +81,9 @@ def disable_warnings(self):
         self.Append(CCFLAGS=["/w"])
         self.Append(CFLAGS=["/w"])
         self.Append(CXXFLAGS=["/w"])
-        self["CCFLAGS"] = [x for x in self["CCFLAGS"] if not x in warn_flags]
-        self["CFLAGS"] = [x for x in self["CFLAGS"] if not x in warn_flags]
-        self["CXXFLAGS"] = [x for x in self["CXXFLAGS"] if not x in warn_flags]
+        self["CCFLAGS"] = [x for x in self["CCFLAGS"] if x not in warn_flags]
+        self["CFLAGS"] = [x for x in self["CFLAGS"] if x not in warn_flags]
+        self["CXXFLAGS"] = [x for x in self["CXXFLAGS"] if x not in warn_flags]
     else:
         self.Append(CCFLAGS=["-w"])
         self.Append(CFLAGS=["-w"])
@@ -117,31 +117,31 @@ def make_icu_data(target, source, env):
 def write_macos_plist(target, binary_name, identifier, name):
     os.makedirs(f"{target}/Resource/", exist_ok=True)
     with open(f"{target}/Resource/Info.plist", "w", encoding="utf-8", newline="\n") as f:
-        f.write(f'<?xml version="1.0" encoding="UTF-8"?>\n')
-        f.write(
-            f'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n'
-        )
-        f.write(f'<plist version="1.0">\n')
-        f.write(f"<dict>\n")
-        f.write(f"\t<key>CFBundleExecutable</key>\n")
-        f.write(f"\t<string>{binary_name}</string>\n")
-        f.write(f"\t<key>CFBundleIdentifier</key>\n")
-        f.write(f"\t<string>{identifier}</string>\n")
-        f.write(f"\t<key>CFBundleInfoDictionaryVersion</key>\n")
-        f.write(f"\t<string>6.0</string>\n")
-        f.write(f"\t<key>CFBundleName</key>\n")
-        f.write(f"\t<string>{name}</string>\n")
-        f.write(f"\t<key>CFBundlePackageType</key>\n")
-        f.write(f"\t<string>FMWK</string>\n")
-        f.write(f"\t<key>CFBundleShortVersionString</key>\n")
-        f.write(f"\t<string>1.0.0</string>\n")
-        f.write(f"\t<key>CFBundleSupportedPlatforms</key>\n")
-        f.write(f"\t<array>\n")
-        f.write(f"\t\t<string>MacOSX</string>\n")
-        f.write(f"\t</array>\n")
-        f.write(f"\t<key>CFBundleVersion</key>\n")
-        f.write(f"\t<string>1.0.0</string>\n")
-        f.write(f"\t<key>LSMinimumSystemVersion</key>\n")
-        f.write(f"\t<string>10.14</string>\n")
-        f.write(f"</dict>\n")
-        f.write(f"</plist>\n")
+        f.write(f"""\
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>{binary_name}</string>
+	<key>CFBundleIdentifier</key>
+	<string>{identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>{name}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.14</string>
+</dict>
+</plist>
+""")