From 6c9045ba135ae8766567f76486e42d8e75d0ee34 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 9 Oct 2020 15:23:51 +0100 Subject: [PATCH] setup.py: Convert to rf'' strings, no need to escape backslashes. --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 9de2f127..b04bd6a7 100755 --- a/setup.py +++ b/setup.py @@ -269,7 +269,7 @@ elif sys.platform == 'win32': raise AssertionError(f'No {dist_dir}/{appname}.wixobj: candle.exe failed?') package_filename = f'{appname}_win_{appversion}.msi' - os.system(f'"{WIXPATH}\\light.exe" -sacl -spdb -sw1076 {dist_dir}\\{appname}.wixobj -out {package_filename}') + os.system(rf'"{WIXPATH}\light.exe" -sacl -spdb -sw1076 {dist_dir}\{appname}.wixobj -out {package_filename}') if not exists(package_filename): raise AssertionError(f'light.exe failed, no {package_filename}') @@ -290,9 +290,9 @@ elif sys.platform == 'win32': join(gettempdir(), f'{appname}_{lcid}.msi') ) # Don't care about codepage because the displayed strings come from msiexec not our msi - os.system(f'cscript /nologo "{SDKPATH}\\WiLangId.vbs" {gettempdir()}\\{appname}_{lcid}.msi Product {lcid}') - os.system(f'"{SDKPATH}\\MsiTran.Exe" -g {gettempdir()}\\{appname}_1033.msi {gettempdir()}\\{appname}_{lcid}.msi {gettempdir()}\\{lcid}.mst') # noqa: E501 # Not going to get shorter - os.system(f'cscript /nologo "{SDKPATH}\\WiSubStg.vbs" {package_filename} {gettempdir()}\\{lcid}.mst {lcid}') + os.system(rf'cscript /nologo "{SDKPATH}\WiLangId.vbs" {gettempdir()}\{appname}_{lcid}.msi Product {lcid}') + os.system(rf'"{SDKPATH}\MsiTran.Exe" -g {gettempdir()}\{appname}_1033.msi {gettempdir()}\{appname}_{lcid}.msi {gettempdir()}\{lcid}.mst') # noqa: E501 # Not going to get shorter + os.system(rf'cscript /nologo "{SDKPATH}\WiSubStg.vbs" {package_filename} {gettempdir()}\{lcid}.mst {lcid}') else: raise AssertionError('Unsupported platform')