diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2022-06-27 23:13:34 +0200 |
|---|---|---|
| committer | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2022-06-29 11:01:50 +0200 |
| commit | eba195611ac30fd490e87a03238060eca05f2073 (patch) | |
| tree | 0f953f3cbcb72de1d589bfe9a39fd55026a1c6fb /build_scripts/main.py | |
| parent | ea9ac28cc215289ae46b1679c58a3acfc66883fc (diff) | |
build: replace the usage of reserved Python words
Internally, we were using many words like 'filter', 'vars',
and 'dir' which are built-in functions in Python.
To avoid confusion and a possible wrong behavior, we renamed them.
Pick-to: 6.2 6.3
Change-Id: Idbadda3857705ef3a5f0440112ee923d3a61ffa0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts/main.py')
| -rw-r--r-- | build_scripts/main.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 3c456c342..88bae4e3c 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -886,7 +886,7 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): """ try: log.info("\nPreparing setup tools build directory.\n") - vars = { + _vars = { "site_packages_dir": self.site_packages_dir, "sources_dir": self.sources_dir, "install_dir": self.install_dir, @@ -918,7 +918,7 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): # Needed for correct file installation in generator build # case. if config.is_internal_shiboken_generator_build(): - vars['cmake_package_name'] = config.shiboken_module_option_name + _vars['cmake_package_name'] = config.shiboken_module_option_name os.chdir(self.script_dir) @@ -936,10 +936,10 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): log.warn(f'ignored error: {e}') if sys.platform == "win32": - vars['dbg_postfix'] = OPTION["DEBUG"] and "_d" or "" - return prepare_packages_win32(self, vars) + _vars['dbg_postfix'] = OPTION["DEBUG"] and "_d" or "" + return prepare_packages_win32(self, _vars) else: - return prepare_packages_posix(self, vars) + return prepare_packages_posix(self, _vars) except IOError as e: print('setup.py/prepare_packages: ', e) raise @@ -949,10 +949,10 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): return True return False - def get_built_pyside_config(self, vars): + def get_built_pyside_config(self, _vars): # Get config that contains list of built modules, and # SOVERSIONs of the built libraries. - st_build_dir = vars['st_build_dir'] + st_build_dir = _vars['st_build_dir'] config_path = os.path.join(st_build_dir, config.package_name(), "_config.py") temp_config = get_python_dict(config_path) if 'built_modules' not in temp_config: @@ -1021,10 +1021,10 @@ class PysideBuild(_build, DistUtilsCommandMixin, BuildInfoCollectorMixin): clang_lib_path = os.path.abspath(clang_lib_path) # The destination will be the shiboken package folder. - vars = {} - vars['st_build_dir'] = self.st_build_dir - vars['st_package_name'] = config.package_name() - destination_dir = "{st_build_dir}/{st_package_name}".format(**vars) + _vars = {} + _vars['st_build_dir'] = self.st_build_dir + _vars['st_package_name'] = config.package_name() + destination_dir = "{st_build_dir}/{st_package_name}".format(**_vars) if os.path.exists(clang_lib_path): basename = os.path.basename(clang_lib_path) |