15 files changed, 51 insertions, 42 deletions
diff --git a/platform/SCsub b/platform/SCsub
index b24c189848..b07023efed 100644
--- a/platform/SCsub
+++ b/platform/SCsub
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 
-import methods
 from glob import glob
 from pathlib import Path
 
+import methods
+
 Import("env")
 
 env.platform_sources = []
diff --git a/platform/android/SCsub b/platform/android/SCsub
index 4d76ffb180..bc1b5e9200 100644
--- a/platform/android/SCsub
+++ b/platform/android/SCsub
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 
-import sys
 import subprocess
+import sys
+
 from methods import print_warning
 
 Import("env")
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 6a8c4ed86d..485f31dee2 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -1,10 +1,11 @@
 import os
-import sys
 import platform
 import subprocess
-from methods import print_warning, print_error
+import sys
 from typing import TYPE_CHECKING
 
+from methods import print_error, print_warning
+
 if TYPE_CHECKING:
     from SCons.Script.SConscript import SConsEnvironment
 
diff --git a/platform/ios/SCsub b/platform/ios/SCsub
index f38914434b..cff7dcc1fd 100644
--- a/platform/ios/SCsub
+++ b/platform/ios/SCsub
@@ -2,11 +2,11 @@
 
 Import("env")
 
-import os, json
-from platform_methods import architectures, lipo, get_build_version, detect_mvk
-import subprocess
+import os
 import shutil
 
+from platform_methods import detect_mvk, lipo
+
 
 def generate_bundle(target, source, env):
     bin_dir = Dir("#bin").abspath
diff --git a/platform/ios/detect.py b/platform/ios/detect.py
index e3bac4ec5c..eb233a5d54 100644
--- a/platform/ios/detect.py
+++ b/platform/ios/detect.py
@@ -1,9 +1,9 @@
 import os
 import sys
-from methods import print_error, detect_darwin_sdk_path
-
 from typing import TYPE_CHECKING
 
+from methods import detect_darwin_sdk_path, print_error
+
 if TYPE_CHECKING:
     from SCons.Script.SConscript import SConsEnvironment
 
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
index 47f3bcadc9..28825038ca 100644
--- a/platform/linuxbsd/detect.py
+++ b/platform/linuxbsd/detect.py
@@ -1,11 +1,11 @@
 import os
 import platform
 import sys
-from methods import print_warning, print_error, get_compiler_version, using_gcc
-from platform_methods import detect_arch
-
 from typing import TYPE_CHECKING
 
+from methods import get_compiler_version, print_error, print_warning, using_gcc
+from platform_methods import detect_arch
+
 if TYPE_CHECKING:
     from SCons.Script.SConscript import SConsEnvironment
 
diff --git a/platform/macos/SCsub b/platform/macos/SCsub
index 59ef4ee85c..eb8524826f 100644
--- a/platform/macos/SCsub
+++ b/platform/macos/SCsub
@@ -2,11 +2,13 @@
 
 Import("env")
 
-import os, json
-from platform_methods import architectures, lipo, get_build_version
-import platform_macos_builders
-import subprocess
+import os
 import shutil
+import subprocess
+
+import platform_macos_builders
+
+from platform_methods import get_build_version, lipo
 
 
 def generate_bundle(target, source, env):
diff --git a/platform/macos/detect.py b/platform/macos/detect.py
index a5ef29e34f..f02f693dd9 100644
--- a/platform/macos/detect.py
+++ b/platform/macos/detect.py
@@ -1,10 +1,10 @@
 import os
 import sys
-from methods import print_error, detect_darwin_sdk_path, get_compiler_version, is_vanilla_clang
-from platform_methods import detect_arch, detect_mvk
-
 from typing import TYPE_CHECKING
 
+from methods import detect_darwin_sdk_path, get_compiler_version, is_vanilla_clang, print_error
+from platform_methods import detect_arch, detect_mvk
+
 if TYPE_CHECKING:
     from SCons.Script.SConscript import SConsEnvironment
 
@@ -107,7 +107,7 @@ def configure(env: "SConsEnvironment"):
 
     env.Append(CCFLAGS=["-fobjc-arc"])
 
-    if not "osxcross" in env:  # regular native build
+    if "osxcross" not in env:  # regular native build
         if env["macports_clang"] != "no":
             mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local")
             mpclangver = env["macports_clang"]
diff --git a/platform/web/SCsub b/platform/web/SCsub
index bc5893ab3a..fea2fa7df9 100644
--- a/platform/web/SCsub
+++ b/platform/web/SCsub
@@ -6,9 +6,10 @@ Import("env")
 
 # The HTTP server "targets". Run with "scons p=web serve", or "scons p=web run"
 if "serve" in COMMAND_LINE_TARGETS or "run" in COMMAND_LINE_TARGETS:
-    from serve import serve
     import os
 
+    from serve import serve
+
     port = os.environ.get("GODOT_WEB_TEST_PORT", 8060)
     try:
         port = int(port)
diff --git a/platform/web/detect.py b/platform/web/detect.py
index ccd884b225..524ff44f4d 100644
--- a/platform/web/detect.py
+++ b/platform/web/detect.py
@@ -1,18 +1,19 @@
 import os
 import sys
+from typing import TYPE_CHECKING
 
 from emscripten_helpers import (
-    run_closure_compiler,
-    create_engine_file,
+    add_js_externs,
     add_js_libraries,
     add_js_pre,
-    add_js_externs,
+    create_engine_file,
     create_template_zip,
     get_template_zip_path,
+    run_closure_compiler,
 )
-from methods import print_warning, print_error, get_compiler_version
 from SCons.Util import WhereIs
-from typing import TYPE_CHECKING
+
+from methods import get_compiler_version, print_error, print_warning
 
 if TYPE_CHECKING:
     from SCons.Script.SConscript import SConsEnvironment
diff --git a/platform/web/emscripten_helpers.py b/platform/web/emscripten_helpers.py
index 3ba133c9a1..745b2457fa 100644
--- a/platform/web/emscripten_helpers.py
+++ b/platform/web/emscripten_helpers.py
@@ -1,4 +1,5 @@
-import os, json
+import json
+import os
 
 from SCons.Util import WhereIs
 
@@ -24,13 +25,13 @@ def get_build_version():
     import version
 
     name = "custom_build"
-    if os.getenv("BUILD_NAME") != None:
+    if os.getenv("BUILD_NAME") is not None:
         name = os.getenv("BUILD_NAME")
     v = "%d.%d" % (version.major, version.minor)
     if version.patch > 0:
         v += ".%d" % version.patch
     status = version.status
-    if os.getenv("GODOT_VERSION_STATUS") != None:
+    if os.getenv("GODOT_VERSION_STATUS") is not None:
         status = str(os.getenv("GODOT_VERSION_STATUS"))
     v += ".%s.%s" % (status, name)
     return v
diff --git a/platform/web/serve.py b/platform/web/serve.py
index 89dff63ca3..f0b0ec9622 100755
--- a/platform/web/serve.py
+++ b/platform/web/serve.py
@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
 
-from http.server import HTTPServer, SimpleHTTPRequestHandler, test  # type: ignore
-from pathlib import Path
-import os
-import sys
 import argparse
 import contextlib
+import os
 import socket
 import subprocess
+import sys
+from http.server import HTTPServer, SimpleHTTPRequestHandler, test  # type: ignore
+from pathlib import Path
 
 
 # See cpython GH-17851 and GH-17864.
diff --git a/platform/windows/SCsub b/platform/windows/SCsub
index 435c501956..1c2bfb9b75 100644
--- a/platform/windows/SCsub
+++ b/platform/windows/SCsub
@@ -4,6 +4,7 @@ Import("env")
 
 import os
 from pathlib import Path
+
 import platform_windows_builders
 
 sources = []
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 93eb34001e..b66cdadc41 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -1,12 +1,12 @@
-import methods
 import os
 import subprocess
 import sys
-from methods import print_warning, print_error
-from platform_methods import detect_arch
-
 from typing import TYPE_CHECKING
 
+import methods
+from methods import print_error, print_warning
+from platform_methods import detect_arch
+
 if TYPE_CHECKING:
     from SCons.Script.SConscript import SConsEnvironment
 
@@ -178,7 +178,7 @@ def get_opts():
             caller_frame = inspect.stack()[1]
             caller_script_dir = os.path.dirname(os.path.abspath(caller_frame[1]))
             d3d12_deps_folder = os.path.join(caller_script_dir, "bin", "build_deps")
-        except:  # Give up.
+        except Exception:  # Give up.
             d3d12_deps_folder = ""
 
     return [
@@ -523,7 +523,7 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
             env.Append(CXXFLAGS=["/bigobj"])
 
         # PIX
-        if not env["arch"] in ["x86_64", "arm64"] or env["pix_path"] == "" or not os.path.exists(env["pix_path"]):
+        if env["arch"] not in ["x86_64", "arm64"] or env["pix_path"] == "" or not os.path.exists(env["pix_path"]):
             env["use_pix"] = False
 
         if env["use_pix"]:
@@ -750,7 +750,7 @@ def configure_mingw(env: "SConsEnvironment"):
         env.Append(LIBS=["dxgi", "dxguid"])
 
         # PIX
-        if not env["arch"] in ["x86_64", "arm64"] or env["pix_path"] == "" or not os.path.exists(env["pix_path"]):
+        if env["arch"] not in ["x86_64", "arm64"] or env["pix_path"] == "" or not os.path.exists(env["pix_path"]):
             env["use_pix"] = False
 
         if env["use_pix"]:
diff --git a/platform/windows/platform_windows_builders.py b/platform/windows/platform_windows_builders.py
index 729d55cea6..3fd9e1a581 100644
--- a/platform/windows/platform_windows_builders.py
+++ b/platform/windows/platform_windows_builders.py
@@ -1,8 +1,8 @@
 """Functions used to generate source files during build time"""
 
 import os
-from detect import get_mingw_bin_prefix
-from detect import try_cmd
+
+from detect import get_mingw_bin_prefix, try_cmd
 
 
 def make_debug_mingw(target, source, env):