commit: d0abc208b06e698edd11358f61428b17c7f60ec1
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Apr 11 09:06:13 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 00:37:43 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0abc208
dev-util/nvidia-cuda-toolkit: use different string separator inside f-strings
Python before 3.12 doesn't handle re-using the same string side separators used
for f-strings inside {}. So we use " for the f-string and '' for the id to look
up.
See-also: https://peps.python.org/pep-0701/
Closes: https://bugs.gentoo.org/953347
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/nvidia-cuda-toolkit/files/parse_manifest.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dev-util/nvidia-cuda-toolkit/files/parse_manifest.py
b/dev-util/nvidia-cuda-toolkit/files/parse_manifest.py
index 57adad1ca975..d50545c4b8cc 100644
--- a/dev-util/nvidia-cuda-toolkit/files/parse_manifest.py
+++ b/dev-util/nvidia-cuda-toolkit/files/parse_manifest.py
@@ -157,7 +157,7 @@ def main():
# optional dir offset, we merge it into path
dir = ""
if "dir" in node.attrib:
- dir = f" \"{Path(node.attrib["dir"])}\""
+ dir = f" \"{Path(node.attrib['dir'])}\""
filepath = basedir / path / file
@@ -183,12 +183,12 @@ def main():
subdir = ""
if "subdir" in node.attrib:
- subdir = f" \"{node.attrib["subdir"]}\""
+ subdir = f" \"{node.attrib['subdir']}\""
print(f"{ind * (level + 1) * indent}dopcfile "
f"\"{lib_name}\" "
f"\"{lib_version}\" "
- f"\"{node.attrib["description"]}\"{subdir}")
+ f"\"{node.attrib['description']}\"{subdir}")
# <desktopFile
# filename="nsight"
@@ -202,13 +202,13 @@ def main():
# create a .desktop file
for node in el.findall("./desktopFile"):
print(f"{ind * (level + 1) * indent}dodesktopFile \\")
- print(f"{ind * (level + 2) *
indent}\"{node.attrib["filename"]}\" \\")
- print(f"{ind * (level + 2) * indent}\"{node.attrib["name"]}\"
\\")
- print(f"{ind * (level + 2) *
indent}\"{node.attrib["categories"]}\" \\")
- print(f"{ind * (level + 2) *
indent}\"{node.attrib["keywords"]}\" \\")
- print(f"{ind * (level + 2) *
indent}\"{node.attrib["iconPath"]}\" \\")
- print(f"{ind * (level + 2) *
indent}\"{node.attrib["execPath"]}\" \\")
- print(f"{ind * (level + 2) *
indent}\"{node.attrib["tryExecPath"]}\"")
+ print(f"{ind * (level + 2) *
indent}\"{node.attrib['filename']}\" \\")
+ print(f"{ind * (level + 2) * indent}\"{node.attrib['name']}\"
\\")
+ print(f"{ind * (level + 2) *
indent}\"{node.attrib['categories']}\" \\")
+ print(f"{ind * (level + 2) *
indent}\"{node.attrib['keywords']}\" \\")
+ print(f"{ind * (level + 2) *
indent}\"{node.attrib['iconPath']}\" \\")
+ print(f"{ind * (level + 2) *
indent}\"{node.attrib['execPath']}\" \\")
+ print(f"{ind * (level + 2) *
indent}\"{node.attrib['tryExecPath']}\"")
# iterator over all nested packages
for node in el.findall("./package"):
