flake8: fix style issues to build_scripts/

Change-Id: Ie56b054ca32869a488356b31eea49cc985fc463e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit ce847a38201eaf99d90af71522c4b492f4c78e26)

15 files changed, 115 insertions, 113 deletions

diff --git a/build_scripts/build_info_collector.py b/build_scripts/build_info_collector.py
index b90d95053..61eb8197b 100644
--- a/build_scripts/build_info_collector.py
+++ b/build_scripts/build_info_collector.py
@@ -40,11 +40,11 @@
 import os
 import platform
 import sys
+from sysconfig import get_config_var
 
 from setuptools._distutils import log
-from setuptools._distutils.errors import DistutilsSetupError
-from sysconfig import get_config_var
 from setuptools._distutils import sysconfig as sconfig
+from setuptools._distutils.errors import DistutilsSetupError
 
 from .options import OPTION
 from .qtinfo import QtInfo
@@ -327,8 +327,8 @@ class BuildInfoCollectorMixin(object):
         self.build_type = build_type
 
         if self.is_cross_compile:
-            site_packages_without_prefix = self.python_target_info['python_info']['site_packages_dir']
-            self.site_packages_dir = os.path.join(install_dir, site_packages_without_prefix)
+            site_packages_no_prefix = self.python_target_info['python_info']['site_packages_dir']
+            self.site_packages_dir = os.path.join(install_dir, site_packages_no_prefix)
         else:
             self.site_packages_dir = sconfig.get_python_lib(1, 0, prefix=install_dir)
 
diff --git a/build_scripts/config.py b/build_scripts/config.py
index 3d065c287..b0bf7fb8a 100644
--- a/build_scripts/config.py
+++ b/build_scripts/config.py
@@ -38,7 +38,9 @@
 #############################################################################
 
 import os
+
 from setuptools._distutils import log
+
 from .versions import PYSIDE, PYSIDE_MODULE, SHIBOKEN
 
 
@@ -215,7 +217,9 @@ class Config(object):
         elif self.internal_build_type == self.shiboken_generator_option_name:
             setup_kwargs['name'] = self.shiboken_generator_st_name
             setup_kwargs['description'] = "Python / C++ bindings generator"
-            setup_kwargs['install_requires'] = [f"{self.shiboken_module_st_name}=={package_version}"]
+            setup_kwargs['install_requires'] = [
+                f"{self.shiboken_module_st_name}=={package_version}"
+            ]
             setup_kwargs['entry_points'] = {
                 'console_scripts': [
                     f'{SHIBOKEN} = {package_name}.scripts.shiboken_tool:main',
@@ -225,23 +229,17 @@ class Config(object):
 
         elif self.internal_build_type == self.pyside_option_name:
             setup_kwargs['name'] = self.pyside_st_name
-            setup_kwargs['description'] = "Python bindings for the Qt cross-platform application and UI framework"
-            setup_kwargs['install_requires'] = [f"{self.shiboken_module_st_name}=={package_version}"]
+            setup_kwargs['description'] = ("Python bindings for the Qt cross-platform application "
+                                           "and UI framework")
+            setup_kwargs['install_requires'] = [
+                f"{self.shiboken_module_st_name}=={package_version}"
+            ]
+            _pyside_tools = ["uic", "rcc", "assistant", "designer", "linguist",
+                             "lupdate", "lrelease", "genpyi", "metaobjectdump",
+                             "project", "qmltyperegistrar", "qmllint"]
             setup_kwargs['entry_points'] = {
-                'console_scripts': [
-                    f'{PYSIDE}-uic = {package_name}.scripts.pyside_tool:uic',
-                    f'{PYSIDE}-rcc = {package_name}.scripts.pyside_tool:rcc',
-                    f'{PYSIDE}-assistant = {package_name}.scripts.pyside_tool:assistant',
-                    f'{PYSIDE}-designer= {package_name}.scripts.pyside_tool:designer',
-                    f'{PYSIDE}-linguist = {package_name}.scripts.pyside_tool:linguist',
-                    f'{PYSIDE}-lupdate = {package_name}.scripts.pyside_tool:lupdate',
-                    f'{PYSIDE}-lrelease = {package_name}.scripts.pyside_tool:lrelease',
-                    f'{PYSIDE}-genpyi = {package_name}.scripts.pyside_tool:genpyi',
-                    f'{PYSIDE}-metaobjectdump = {package_name}.scripts.pyside_tool:metaobjectdump',
-                    f'{PYSIDE}-project = {package_name}.scripts.pyside_tool:project',
-                    f'{PYSIDE}-qmltyperegistrar = {package_name}.scripts.pyside_tool:qmltyperegistrar',
-                    f'{PYSIDE}-qmllint = {package_name}.scripts.pyside_tool:qmllint'
-                ]
+                'console_scripts': [f'{PYSIDE}-{tool} = {package_name}.scripts.pyside_tool:{tool}'
+                                    for tool in _pyside_tools]
             }
         self.setup_kwargs = setup_kwargs
 
diff --git a/build_scripts/main.py b/build_scripts/main.py
index 3f8ebd4d7..861913be6 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -37,56 +37,50 @@
 ##
 #############################################################################
 
-from packaging.version import parse as parse_version
-
+import importlib
 import os
 import platform
 import re
 import sys
-import importlib
+import time
 from pathlib import Path
+from shutil import which
 from textwrap import dedent
-import time
-from .config import config
-from .utils import get_numpy_location, get_python_dict
-from .options import DistUtilsCommandMixin, OPTION
-from .build_info_collector import BuildInfoCollectorMixin
-from .versions import PYSIDE, PYSIDE_MODULE, SHIBOKEN
-from .wheel_utils import (get_package_version,
-                          get_package_timestamp, macos_plat_name,
-                          macos_pyside_min_deployment_target)
 
 import setuptools  # Import setuptools before distutils
-from setuptools import Extension
-from setuptools.command.install import install as _install
-from setuptools.command.install_lib import install_lib as _install_lib
-from setuptools.command.bdist_egg import bdist_egg as _bdist_egg
-from setuptools.command.develop import develop as _develop
-from setuptools.command.build_py import build_py as _build_py
-
 # PYSIDE-1760: Although not used here, pre-load this module early to avoid
 #              a racing condition with the import order. Note that this problem
 #              happens only with custom builds of Python without virtual environment.
 import setuptools.command.install_scripts
-
-# Use the distutils implementation within setuptools
-from setuptools._distutils.errors import DistutilsSetupError
+from packaging.version import parse as parse_version
+from setuptools import Command, Extension
 from setuptools._distutils import log
 from setuptools._distutils import sysconfig as sconfig
 from setuptools._distutils.command.build import build as _build
-
-from shutil import which
+# Use the distutils implementation within setuptools
+from setuptools._distutils.errors import DistutilsSetupError
+from setuptools.command.bdist_egg import bdist_egg as _bdist_egg
 from setuptools.command.build_ext import build_ext as _build_ext
-from setuptools import Command
+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 .qtinfo import QtInfo
-from .utils import (rmtree, detect_clang, copyfile, copydir, run_process_output, run_process,
-                    update_env_path, init_msvc_env, filter_match, macos_fix_rpaths_for_library,
-                    linux_fix_rpaths_for_library, platform_cmake_options)
+from .build_info_collector import BuildInfoCollectorMixin
+from .config import config
+from .options import OPTION, DistUtilsCommandMixin
 from .platforms.unix import prepare_packages_posix
 from .platforms.windows_desktop import prepare_packages_win32
-from .wheel_override import wheel_module_exists, get_bdist_wheel_override
-
+from .qtinfo import QtInfo
+from .utils import (copydir, copyfile, detect_clang, filter_match,
+                    get_numpy_location, get_python_dict, init_msvc_env,
+                    linux_fix_rpaths_for_library, macos_fix_rpaths_for_library,
+                    platform_cmake_options, rmtree, run_process,
+                    run_process_output, update_env_path)
+from .versions import PYSIDE, PYSIDE_MODULE, SHIBOKEN
+from .wheel_override import get_bdist_wheel_override, wheel_module_exists
+from .wheel_utils import (get_package_timestamp, get_package_version,
+                          macos_plat_name, macos_pyside_min_deployment_target)
 
 setup_script_dir = os.getcwd()
 build_scripts_dir = os.path.join(setup_script_dir, 'build_scripts')
@@ -148,7 +142,8 @@ def get_make(platform_arch, build_type):
     if not os.path.isabs(make_path):
         found_path = which(make_path)
         if not found_path or not os.path.exists(found_path):
-            m = f"You need the program '{make_path}' on your system path to compile {PYSIDE_MODULE}."
+            m = (f"You need the program '{make_path}' on your system path to "
+                 f"compile {PYSIDE_MODULE}.")
             raise DistutilsSetupError(m)
         make_path = found_path
     return (make_path, make_generator)
@@ -457,7 +452,7 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin):
             _src = Path(_path / _package_name)
             _dst = Path(_wheel_path / _package_name)
             try:
-                Path(_path / _package_name).rename(_wheel_path / _package_name)
+                _src.rename(_dst)
             except Exception as e:
                 log.warn(f'***** problem renaming "{self.st_build_dir}"')
                 log.warn(f'ignored error: {type(e).__name__}: {e}')
@@ -615,7 +610,8 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin):
                 cmake_cmd.append(f"-DShiboken6_DIR={config_dir}")
             else:
 
-                log.info(f"Custom provided {SHIBOKEN} installation not found. Path given: {config_dir}")
+                log.info(f"Custom provided {SHIBOKEN} installation not found. "
+                         f"Path given: {config_dir}")
 
         if OPTION["MODULE_SUBSET"]:
             module_sub_set = ''
diff --git a/build_scripts/options.py b/build_scripts/options.py
index 456f342a3..80b92e887 100644
--- a/build_scripts/options.py
+++ b/build_scripts/options.py
@@ -38,24 +38,24 @@
 #############################################################################
 
 try:
-    from setuptools._distutils import log
     from setuptools import Command
+    from setuptools._distutils import log
 except ModuleNotFoundError:
     # This is motivated by our CI using an old version of setuptools
     # so then the coin_build_instructions.py script is executed, and
     # import from this file, it was failing.
     from distutils import log
     from distutils.cmd import Command
-from shutil import which
-import sys
+
 import os
+import sys
 import warnings
 from pathlib import Path
+from shutil import which
 
 from .qtinfo import QtInfo
 from .utils import memoize
 
-
 _AVAILABLE_MKSPECS = ["ninja", "msvc", "mingw"] if sys.platform == "win32" else ["ninja", "make"]
 
 
@@ -533,7 +533,8 @@ class DistUtilsCommandMixin(object):
             # Check for existence, but don't require if it's not set. A
             # check later will be done to see if it's needed.
             if self.qt_target_path and not os.path.exists(self.qt_target_path):
-                log.error(f"Provided --qt-target-path='{self.qt_target_path}' path does not exist.")
+                log.error(f"Provided --qt-target-path='{self.qt_target_path}' "
+                          "path does not exist.")
                 return False
 
         if not self.make_spec:
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py
index f28796a22..f18399119 100644
--- a/build_scripts/platforms/linux.py
+++ b/build_scripts/platforms/linux.py
@@ -38,11 +38,13 @@
 #############################################################################
 
 import os
-from ..utils import (copydir, copyfile, copy_icu_libs, find_files_using_glob,
-                     linux_patch_executable)
+
 from ..config import config
+from ..utils import (copy_icu_libs, copydir, copyfile, find_files_using_glob,
+                     linux_patch_executable)
 from ..versions import PYSIDE
 
+
 def prepare_standalone_package_linux(self, vars):
     built_modules = vars['built_modules']
 
diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py
index 25903ff1c..b8b8c7d00 100644
--- a/build_scripts/platforms/macos.py
+++ b/build_scripts/platforms/macos.py
@@ -39,8 +39,10 @@
 
 import fnmatch
 import os
-from ..utils import copydir, copyfile, macos_fix_rpaths_for_library, macos_add_rpath
+
 from ..config import config
+from ..utils import (copydir, copyfile, macos_add_rpath,
+                     macos_fix_rpaths_for_library)
 from ..versions import PYSIDE
 
 
@@ -177,7 +179,7 @@ def prepare_standalone_package_macos(self, vars):
             if copy_qt_conf:
                 # Copy the qt.conf file to libexec.
                 if not os.path.isdir(qt_libexec_path):
-                     os.makedirs(qt_libexec_path)
+                    os.makedirs(qt_libexec_path)
                 copyfile(
                     f"{{build_dir}}/{PYSIDE}/{{st_package_name}}/qt.conf",
                     qt_libexec_path, vars=vars)
@@ -186,7 +188,7 @@ def prepare_standalone_package_macos(self, vars):
         is_pypy = "pypy" in self.build_classifiers
         # <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins
         plugins_target = "{st_build_dir}/{st_package_name}/Qt/plugins"
-        filters=["*.dylib"]
+        filters = ["*.dylib"]
         copydir("{qt_plugins_dir}", plugins_target,
                 filter=filters,
                 recursive=True,
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index 8a06b899b..0772cc625 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -37,17 +37,16 @@
 ##
 #############################################################################
 
+import fnmatch
 import os
 import sys
-import fnmatch
-from .linux import prepare_standalone_package_linux
-from .macos import prepare_standalone_package_macos
 
 from ..config import config
 from ..options import OPTION
-from ..qtinfo import QtInfo
 from ..utils import copydir, copyfile, makefile
 from ..versions import PYSIDE, SHIBOKEN
+from .linux import prepare_standalone_package_linux
+from .macos import prepare_standalone_package_macos
 
 
 def _macos_copy_gui_executable(name, vars=None):
@@ -70,7 +69,7 @@ def _unix_copy_gui_executable(name, vars=None):
 
 def _copy_gui_executable(name, vars=None):
     """Copy a GUI executable and return the files"""
-    if  sys.platform == 'darwin':
+    if sys.platform == 'darwin':
         return _macos_copy_gui_executable(name, vars)
     return _unix_copy_gui_executable(name, vars)
 
@@ -160,7 +159,6 @@ def prepare_packages_posix(self, vars):
             filter=[f"{PYSIDE}-lupdate"],
             recursive=False, vars=vars))
 
-
         lib_exec_filters = []
         if not OPTION['NO_QT_TOOLS']:
             lib_exec_filters.extend(['uic', 'rcc', 'qmltyperegistrar'])
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
index f4e85e9a6..88768c3c3 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -37,15 +37,14 @@
 ##
 #############################################################################
 
+import fnmatch
 import functools
 import os
-import fnmatch
 
 from ..config import config
 from ..options import OPTION
-from ..utils import copydir, copyfile, makefile
-from ..utils import filter_match
-from ..utils import download_and_extract_7z
+from ..utils import (copydir, copyfile, download_and_extract_7z, filter_match,
+                     makefile)
 from ..versions import PYSIDE, SHIBOKEN
 
 
@@ -173,8 +172,8 @@ def prepare_packages_win32(self, vars):
         # <qt>/lib/metatypes/* -> <setup>/{st_package_name}/lib/metatypes
         destination_lib_dir = "{st_build_dir}/{st_package_name}/lib"
         copydir("{qt_lib_dir}/metatypes", f"{destination_lib_dir}/metatypes",
-               filter=["*.json"],
-               recursive=False, vars=vars)
+                filter=["*.json"],
+                recursive=False, vars=vars)
 
         # <install>/lib/*.lib -> {st_package_name}/
         copydir(
@@ -275,7 +274,8 @@ def copy_msvc_redist_files(vars, redist_target_path):
             zip_file = "pyside_qt_deps_32_2019.7z"
         try:
             download_and_extract_7z(redist_url + zip_file, redist_target_path)
-        except:
+        except Exception as e:
+            print(f"Download failed: {type(e).__name__}: {e}")
             print("download.qt.io is down, try with mirror")
             redist_url = "https://master.qt.io/development_releases/prebuilt/vcredist/"
             download_and_extract_7z(redist_url + zip_file, redist_target_path)
diff --git a/build_scripts/qp5_tool.py b/build_scripts/qp5_tool.py
index 4684018ea..ac9dab457 100644
--- a/build_scripts/qp5_tool.py
+++ b/build_scripts/qp5_tool.py
@@ -37,16 +37,15 @@
 ##
 #############################################################################
 
-from argparse import ArgumentParser, RawTextHelpFormatter
 import datetime
-from enum import Enum
 import os
 import re
 import subprocess
 import sys
 import time
 import warnings
-
+from argparse import ArgumentParser, RawTextHelpFormatter
+from enum import Enum
 
 DESC = """
 Utility script for working with Qt for Python.
diff --git a/build_scripts/qtinfo.py b/build_scripts/qtinfo.py
index ee4bbc955..cb4b56950 100644
--- a/build_scripts/qtinfo.py
+++ b/build_scripts/qtinfo.py
@@ -40,8 +40,9 @@
 import os
 import subprocess
 from pathlib import Path
-from .utils import configure_cmake_project, parse_cmake_project_message_info
-from .utils import platform_cmake_options
+
+from .utils import (configure_cmake_project, parse_cmake_project_message_info,
+                    platform_cmake_options)
 
 
 class QtInfo(object):
diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py
index 9971815d4..d489a7e20 100644
--- a/build_scripts/setup_runner.py
+++ b/build_scripts/setup_runner.py
@@ -37,8 +37,8 @@
 ##
 #############################################################################
 
-import sys
 import os
+import sys
 import tempfile
 import textwrap
 
@@ -46,8 +46,8 @@ from setuptools import setup  # Import setuptools before distutils
 from setuptools._distutils import log
 
 from build_scripts.config import config
-from build_scripts.main import get_package_version, get_setuptools_extension_modules
-from build_scripts.main import cmd_class_dict
+from build_scripts.main import (cmd_class_dict, get_package_version,
+                                get_setuptools_extension_modules)
 from build_scripts.options import ADDITIONAL_OPTIONS, OPTION
 from build_scripts.utils import run_process
 
diff --git a/build_scripts/utils.py b/build_scripts/utils.py
index 3f9c3dd25..98f46f277 100644
--- a/build_scripts/utils.py
+++ b/build_scripts/utils.py
@@ -37,22 +37,20 @@
 ##
 #############################################################################
 
-import sys
-from pathlib import Path
+import errno
+import fnmatch
+import glob
+import itertools
 import os
 import re
-import stat
-import errno
 import shutil
+import stat
 import subprocess
-import fnmatch
-import itertools
-import glob
+import sys
 import tempfile
-from collections import defaultdict
-
 import urllib.request as urllib
-
+from collections import defaultdict
+from pathlib import Path
 
 try:
     # Using the distutils implementation within setuptools
@@ -63,6 +61,7 @@ except ModuleNotFoundError:
     # so then the coin_build_instructions.py script is executed, and
     # import from this file, it was failing.
     from distutils import log
+    from distutils.errors import DistutilsSetupError
 
 try:
     WindowsError
@@ -120,8 +119,9 @@ def winsdk_setenv(platform_arch, build_type):
             for sdk_version in sdk_versions:
                 installationfolder = msvc9.Reg.get_value(f"{msvc9.WINSDK_BASE}\\{sdk_version}",
                                                          "installationfolder")
-                # productversion = msvc9.Reg.get_value("{}\\{}".format(msvc9.WINSDK_BASE, sdk_version),
-                #                                "productversion")
+                # productversion = msvc9.Reg.get_value(
+                #                      "{}\\{}".format(msvc9.WINSDK_BASE, sdk_version),
+                #                      "productversion")
                 setenv_path = os.path.join(installationfolder, os.path.join('bin', 'SetEnv.cmd'))
                 if not os.path.exists(setenv_path):
                     continue
@@ -143,7 +143,8 @@ def winsdk_setenv(platform_arch, build_type):
     build_type = "/Debug" if build_type.lower() == "debug" else "/Release"
     setenv_cmd = [setenv_path, build_arch, build_type]
     setenv_env = get_environment_from_batch_command(setenv_cmd)
-    setenv_env_paths = os.pathsep.join([setenv_env[k] for k in setenv_env if k.upper() == 'PATH']).split(os.pathsep)
+    _setenv_paths = [setenv_env[k] for k in setenv_env if k.upper() == 'PATH']
+    setenv_env_paths = os.pathsep.join(_setenv_paths).split(os.pathsep)
     setenv_env_without_paths = dict([(k, setenv_env[k]) for k in setenv_env if k.upper() != 'PATH'])
 
     # Extend os.environ with SDK env
@@ -236,7 +237,8 @@ def init_msvc_env(platform_arch, build_type):
     log.info(f"Getting MSVC env for {msvc_arch} architecture")
     vcvars_cmd = [vcvars_path, msvc_arch]
     msvc_env = get_environment_from_batch_command(vcvars_cmd)
-    msvc_env_paths = os.pathsep.join([msvc_env[k] for k in msvc_env if k.upper() == 'PATH']).split(os.pathsep)
+    _msvc_paths = [msvc_env[k] for k in msvc_env if k.upper() == 'PATH']
+    msvc_env_paths = os.pathsep.join(_msvc_paths).split(os.pathsep)
     msvc_env_without_paths = dict([(k, msvc_env[k]) for k in msvc_env if k.upper() != 'PATH'])
 
     # Extend os.environ with MSVC env
@@ -824,7 +826,8 @@ def _ldd_ldd(executable_path):
     except Exception as e:
         error = str(e)
     if not output:
-        message = f"ldd failed to query for dependent shared libraries of {executable_path}: {error}"
+        message = (f"ldd failed to query for dependent shared libraries of {executable_path}: "
+                   f"{error}")
         raise RuntimeError(message)
     return output
 
@@ -1190,7 +1193,7 @@ def get_qtci_virtualEnv(python_ver, host, hostArch, targetArch):
         try:
             run_instruction([_pExe, "--version"], f"Failed to guess python version {_pExe}")
         except Exception as e:
-            print("Exception {type(e).__name__}: {e}")
+            print(f"Exception {type(e).__name__}: {e}")
             _pExe = "python3"
     return(_pExe, _env, env_pip, env_python)
 
diff --git a/build_scripts/wheel_files.py b/build_scripts/wheel_files.py
index cecdbb779..cf8d1dfa6 100644
--- a/build_scripts/wheel_files.py
+++ b/build_scripts/wheel_files.py
@@ -40,7 +40,7 @@
 
 import sys
 from dataclasses import Field, dataclass, field
-from typing import Any, Dict, List
+from typing import Dict, List
 
 
 # This dataclass is in charge of holding the file information
@@ -208,7 +208,7 @@ def wheel_files_pyside_addons() -> List[ModuleData]:
         module_QtSerialPort(),
         module_QtStateMachine(),
         # Not available in 6.3
-        #module_QtTextToSpeech(),
+        # module_QtTextToSpeech(),
         module_QtVirtualKeyboard(),
         module_QtWebChannel(),
         module_QtWebEngineCore(),
diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py
index 5cc9f3cd1..605ec655e 100644
--- a/build_scripts/wheel_override.py
+++ b/build_scripts/wheel_override.py
@@ -39,24 +39,26 @@
 
 
 import os
-import sys
 import platform
-from .options import DistUtilsCommandMixin, OPTION
-from setuptools._distutils import log as logger
+import sys
 from email.generator import Generator
-from .wheel_utils import get_package_version, get_qt_version, macos_plat_name
+
+from setuptools._distutils import log as logger
+
+from .options import OPTION, DistUtilsCommandMixin
 from .utils import is_64bit
+from .wheel_utils import get_package_version, get_qt_version, macos_plat_name
 
 wheel_module_exists = False
 
 
 try:
 
-    from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
-    from wheel.bdist_wheel import safer_name as _safer_name
-    from wheel.bdist_wheel import get_abi_tag, get_platform
     from packaging import tags
     from wheel import __version__ as wheel_version
+    from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
+    from wheel.bdist_wheel import get_abi_tag, get_platform
+    from wheel.bdist_wheel import safer_name as _safer_name
 
     wheel_module_exists = True
 except Exception as e:
diff --git a/build_scripts/wheel_utils.py b/build_scripts/wheel_utils.py
index 7f2249146..447d42659 100644
--- a/build_scripts/wheel_utils.py
+++ b/build_scripts/wheel_utils.py
@@ -39,10 +39,10 @@
 
 import os
 import time
+from sysconfig import get_config_var, get_platform
 
-from setuptools._distutils.errors import DistutilsSetupError
-from sysconfig import get_platform, get_config_var
 from packaging.version import parse as parse_version
+from setuptools._distutils.errors import DistutilsSetupError
 
 from .options import OPTION
 from .qtinfo import QtInfo