build: fix flake8 warnings and missing f-strings

Change-Id: Ibd2a6088f6a2826be38a13037fe2db6656630b34
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit d8e9b867560dafe1baa75356dbb65a177c74b6d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

7 files changed, 13 insertions, 12 deletions

diff --git a/build_scripts/config.py b/build_scripts/config.py
index b0bf7fb8a..2342eb1a1 100644
--- a/build_scripts/config.py
+++ b/build_scripts/config.py
@@ -276,7 +276,7 @@ class Config(object):
         content += readme
 
         if changes:
-            content += "\n\n" + changes
+            content += f"\n\n{changes}"
 
         return content
 
diff --git a/build_scripts/main.py b/build_scripts/main.py
index a76ad2bc2..bdc24ad05 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -60,7 +60,7 @@ from setuptools.command.build_py import build_py as _build_py
 from setuptools.command.develop import develop as _develop
 from setuptools.command.install import install as _install
 from setuptools.command.install_lib import install_lib as _install_lib
-from setuptools.command.install_scripts import install_scripts  # preload only
+from setuptools.command.install_scripts import install_scripts  # noqa: preload only
 
 # Use the distutils implementation within setuptools (but not before)
 from setuptools._distutils import log
@@ -153,6 +153,7 @@ def get_make(platform_arch, build_type):
 
 _allowed_versions_cache = None
 
+
 def get_allowed_python_versions():
     global _allowed_versions_cache
     if _allowed_versions_cache is not None:
@@ -965,7 +966,7 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin):
             raise
 
     def qt_is_framework_build(self):
-        if os.path.isdir(self.qtinfo.headers_dir + "/../lib/QtCore.framework"):
+        if os.path.isdir(f"{self.qtinfo.headers_dir}/../lib/QtCore.framework"):
             return True
         return False
 
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py
index f18399119..a8d286184 100644
--- a/build_scripts/platforms/linux.py
+++ b/build_scripts/platforms/linux.py
@@ -68,7 +68,7 @@ def prepare_standalone_package_linux(self, vars):
 
     accepted_modules = ['libQt6*.so.?']
     if constrain_modules:
-        accepted_modules = ["libQt6" + module + "*.so.?" for module in constrain_modules]
+        accepted_modules = [f"libQt6{module}*.so.?" for module in constrain_modules]
     accepted_modules.append("libicu*.so.??")
 
     copydir("{qt_lib_dir}", destination_lib_dir,
diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py
index b8b8c7d00..2429ef13f 100644
--- a/build_scripts/platforms/macos.py
+++ b/build_scripts/platforms/macos.py
@@ -153,7 +153,7 @@ def prepare_standalone_package_macos(self, vars):
             ignored_modules.extend(['libQt6WebEngine*.dylib'])
         accepted_modules = ['libQt6*.6.dylib']
         if constrain_modules:
-            accepted_modules = ["libQt6" + module + "*.6.dylib" for module in constrain_modules]
+            accepted_modules = [f"libQt6{module}*.6.dylib" for module in constrain_modules]
 
         copydir("{qt_lib_dir}",
                 "{st_build_dir}/{st_package_name}/Qt/lib",
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
index 88768c3c3..7b96e42a9 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -354,9 +354,9 @@ def copy_qt_artifacts(self, copy_pdbs, vars):
     # <qt>/bin/*.dll and Qt *.pdbs -> <setup>/{st_package_name} part two
     # File filter to copy only debug or only release files.
     if constrain_modules:
-        qt_dll_patterns = ["Qt6" + x + "{}.dll" for x in constrain_modules]
+        qt_dll_patterns = [f"Qt6{x}{{}}.dll" for x in constrain_modules]
         if copy_pdbs:
-            qt_dll_patterns += ["Qt6" + x + "{}.pdb" for x in constrain_modules]
+            qt_dll_patterns += [f"Qt6{x}{{}}.pdb" for x in constrain_modules]
     else:
         qt_dll_patterns = ["Qt6*{}.dll", "lib*{}.dll"]
         if copy_pdbs:
diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py
index d489a7e20..19bb0e4f3 100644
--- a/build_scripts/setup_runner.py
+++ b/build_scripts/setup_runner.py
@@ -66,13 +66,13 @@ class SetupRunner(object):
     @staticmethod
     def cmd_line_argument_is_in_args(argument, args):
         """ Check if command line argument was passed in args. """
-        return any(arg for arg in list(args) if "--" + argument in arg)
+        return any(arg for arg in list(args) if f"--{argument}" in arg)
 
     @staticmethod
     def get_cmd_line_argument_in_args(argument, args):
         """ Gets the value of a cmd line argument passed in args. """
         for arg in list(args):
-            if "--" + argument in arg:
+            if f"--{argument}" in arg:
                 prefix = f"--{argument}"
                 prefix_len = len(prefix) + 1
                 return arg[prefix_len:]
@@ -81,7 +81,7 @@ class SetupRunner(object):
     @staticmethod
     def remove_cmd_line_argument_in_args(argument, args):
         """ Remove command line argument from args. """
-        return [arg for arg in list(args) if "--" + argument not in arg]
+        return [arg for arg in list(args) if f"--{argument}" not in arg]
 
     @staticmethod
     def construct_cmd_line_argument(name, value=None):
diff --git a/build_scripts/utils.py b/build_scripts/utils.py
index 7d0651451..6f13ce426 100644
--- a/build_scripts/utils.py
+++ b/build_scripts/utils.py
@@ -172,11 +172,11 @@ def find_vcdir(version):
     # trying Express edition
     if productdir is None:
         try:
-            hasattr(msvc9, VSEXPRESS_BASE)
+            hasattr(msvc9, VSEXPRESS_BASE)  # noqa: VSEXPRESS_BASE get defined with msvc9
         except AttributeError:
             pass
         else:
-            vsbase = VSEXPRESS_BASE % version
+            vsbase = VSEXPRESS_BASE % version  # noqa: VSEXPRESS_BASE get defined with msvc9
             try:
                 productdir = msvc9.Reg.get_value(rf"{vsbase}\Setup\VC", "productdir")
             except KeyError: