From d6a18cd759f9832045c22d12f22458ecfb3eae4d Mon Sep 17 00:00:00 2001 From: Victor333Huesca Date: Mon, 15 Jan 2024 06:01:19 +0100 Subject: [PATCH] Use raw strings for regex literals This removes warning about invalid escapes. Also drop unicode literals (ignored in python 3), since we don't support python 2. --- scripts/extractWSA.py | 2 +- scripts/generateGappsLink.py | 6 +++--- scripts/generateKernelSULink.py | 2 +- scripts/generateWSALinks.py | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/extractWSA.py b/scripts/extractWSA.py index e9333839e2..39da6b05f8 100644 --- a/scripts/extractWSA.py +++ b/scripts/extractWSA.py @@ -104,7 +104,7 @@ def __repr__(self): elif g.filename == 'AppxManifest.xml': g.filename = f'resources.{name}.xml' l.extract(g, xmldir) - elif re.search(u'Images/.+\.png', g.filename): + elif re.search(r'Images/.+\.png', g.filename): l.extract(g, archdir) with zipfile.ZipFile(zip_path) as zip: stat = Path(zip_path).stat() diff --git a/scripts/generateGappsLink.py b/scripts/generateGappsLink.py index f07a2b1a23..425d8f67fd 100644 --- a/scripts/generateGappsLink.py +++ b/scripts/generateGappsLink.py @@ -50,12 +50,12 @@ print("Failed to fetch from OpenGApps API, fallbacking to SourceForge RSS...") res = requests.get( f'https://sourceforge.net/projects/opengapps/rss?path=/{abi_map[arch]}&limit=100') - link = re.search(f'https://.*{abi_map[arch]}/.*{release}.*{variant}.*\.zip/download', res.text).group().replace( + link = re.search(fr'https://.*{abi_map[arch]}/.*{release}.*{variant}.*\.zip/download', res.text).group().replace( '.zip/download', '.zip').replace('sourceforge.net/projects/opengapps/files', 'downloads.sourceforge.net/project/opengapps') elif brand == "MindTheGapps": res = requests.get( f'https://sourceforge.net/projects/wsa-mtg/rss?path=/{abi_map[arch]}&limit=100') - matched = re.search(f'https://.*{release}.*{abi_map[arch]}.*\.zip/download', res.text) + matched = re.search(fr'https://.*{release}.*{abi_map[arch]}.*\.zip/download', res.text) if matched: link = matched.group().replace( '.zip/download', '.zip').replace('sourceforge.net/projects/wsa-mtg/files', 'downloads.sourceforge.net/project/wsa-mtg') @@ -68,7 +68,7 @@ if res.status_code == 200: assets = json_data["assets"] for asset in assets: - if re.match(f'.*{release}.*{abi_map[arch]}.*\.zip$', asset["name"]) and asset["content_type"] == "application/zip": + if re.match(fr'.*{release}.*{abi_map[arch]}.*\.zip$', asset["name"]) and asset["content_type"] == "application/zip": link = asset["browser_download_url"] break elif res.status_code == 403 and x_ratelimit_remaining == '0': diff --git a/scripts/generateKernelSULink.py b/scripts/generateKernelSULink.py index 3c36bd96bd..dfbf23cf4e 100644 --- a/scripts/generateKernelSULink.py +++ b/scripts/generateKernelSULink.py @@ -62,7 +62,7 @@ def __repr__(self): link = "" assets = json_data["assets"] for asset in assets: - if re.match(f'kernel-WSA-{abi_map[arch]}-{kernelVersion}.*\.zip$', asset["name"]) and asset["content_type"] == "application/zip": + if re.match(fr'kernel-WSA-{abi_map[arch]}-{kernelVersion}.*\.zip$', asset["name"]) and asset["content_type"] == "application/zip": link = asset["browser_download_url"] break if link == "": diff --git a/scripts/generateWSALinks.py b/scripts/generateWSALinks.py index 5286b5ebcf..ec4ef4b230 100644 --- a/scripts/generateWSALinks.py +++ b/scripts/generateWSALinks.py @@ -145,24 +145,24 @@ def send_req(i, v, out_file_name): threads = [] wsa_build_ver = 0 for filename, values in identities.items(): - if re.match(f"MicrosoftCorporationII\.WindowsSubsystemForAndroid_.*\.msixbundle", filename): - tmp_wsa_build_ver = re.search(u'\d{4}.\d{5}.\d{1,}.\d{1,}', filename).group() + if re.match(fr"MicrosoftCorporationII\.WindowsSubsystemForAndroid_.*\.msixbundle", filename): + tmp_wsa_build_ver = re.search(r'\d{4}.\d{5}.\d{1,}.\d{1,}', filename).group() if(wsa_build_ver == 0): wsa_build_ver = tmp_wsa_build_ver elif version.parse(wsa_build_ver) < version.parse(tmp_wsa_build_ver): wsa_build_ver = tmp_wsa_build_ver for filename, values in identities.items(): - if re.match(f"Microsoft\.UI\.Xaml\..*_{arch}_.*\.appx", filename): + if re.match(fr"rMicrosoft\.UI\.Xaml\..*_{arch}_.*\.appx", filename): out_file_name = f"{values[1]}_{arch}.appx" out_file = download_dir / out_file_name - elif re.match(f"Microsoft\.VCLibs\..+\.UWPDesktop_.*_{arch}_.*\.appx", filename): + elif re.match(fr"Microsoft\.VCLibs\..+\.UWPDesktop_.*_{arch}_.*\.appx", filename): out_file_name = f"{values[1]}_{arch}.appx" out_file = download_dir / out_file_name - elif re.match(f"Microsoft\.VCLibs\..+_.*_{arch}_.*\.appx", filename): + elif re.match(fr"Microsoft\.VCLibs\..+_.*_{arch}_.*\.appx", filename): out_file_name = f"{values[1]}_{arch}.appx" out_file = download_dir / out_file_name - elif not skip_wsa_download and re.match(f"MicrosoftCorporationII\.WindowsSubsystemForAndroid_.*\.msixbundle", filename): - tmp_wsa_build_ver = re.search(u'\d{4}.\d{5}.\d{1,}.\d{1,}', filename).group() + elif not skip_wsa_download and re.match(fr"MicrosoftCorporationII\.WindowsSubsystemForAndroid_.*\.msixbundle", filename): + tmp_wsa_build_ver = re.search(r'\d{4}.\d{5}.\d{1,}.\d{1,}', filename).group() if(wsa_build_ver != tmp_wsa_build_ver): continue version_splitted = wsa_build_ver.split(".")