From edeb9bb90e25b73b49fe52caecd79e374690a777 Mon Sep 17 00:00:00 2001 From: Shyamnath Premnadh Date: Thu, 17 Nov 2022 11:53:39 +0100 Subject: Enforce pathlib - unix.py and windows_desktop.py Amend e52b2c9ed9bb86042811b36a910f79dd94fbe0cc Change-Id: Id1d2d964494c7c03baab43769cc4516a3332aa63 Reviewed-by: Cristian Maureira-Fredes --- build_scripts/platforms/unix.py | 3 ++- build_scripts/platforms/windows_desktop.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 0dd0917cc..1359e0bca 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -4,6 +4,7 @@ import fnmatch import os import sys +from pathlib import Path from ..config import config from ..options import OPTION @@ -205,7 +206,7 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): return False return True # examples/* -> /{st_package_name}/examples - copydir(str(pyside_build.script_dir / "examples"), + copydir(Path(pyside_build.script_dir) / "examples", "{st_build_dir}/{st_package_name}/examples", force=False, _vars=_vars, dir_filter_function=pycache_dir_filter) diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 294913d96..1d2e063f6 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -6,7 +6,6 @@ import functools import os from pathlib import Path - from ..config import config from ..options import OPTION from ..utils import (copydir, copyfile, download_and_extract_7z, filter_match, @@ -196,7 +195,7 @@ def prepare_packages_win32(pyside_build, _vars): return False return True # examples/* -> /{st_package_name}/examples - copydir(pyside_build.script_dir / "examples", + copydir(Path(pyside_build.script_dir) / "examples", "{st_build_dir}/{st_package_name}/examples", force=False, _vars=_vars, dir_filter_function=pycache_dir_filter) -- cgit v1.2.3