https://github.com/python/cpython/commit/7dca7322cca7ff146444e56f28f21f1090987fff
commit: 7dca7322cca7ff146444e56f28f21f1090987fff
branch: main
author: Cody Maloney <[email protected]>
committer: zware <[email protected]>
date: 2024-10-08T12:16:02-05:00
summary:
gh-125084: Resolve paths in generator common code (GH-125085)
In out of tree builds, the paths can contain `../ which needs to be
resolved for the relative path calculation to work.
files:
M Tools/cases_generator/generators_common.py
diff --git a/Tools/cases_generator/generators_common.py
b/Tools/cases_generator/generators_common.py
index f32a20b304c354..0bfa1a3b56fbc2 100644
--- a/Tools/cases_generator/generators_common.py
+++ b/Tools/cases_generator/generators_common.py
@@ -43,13 +43,13 @@ def peek(self) -> Token | None:
break
return self.look_ahead
-ROOT = Path(__file__).parent.parent.parent
-DEFAULT_INPUT = (ROOT / "Python/bytecodes.c").absolute().as_posix()
+ROOT = Path(__file__).parent.parent.parent.resolve()
+DEFAULT_INPUT = (ROOT / "Python/bytecodes.c").as_posix()
def root_relative_path(filename: str) -> str:
try:
- return Path(filename).absolute().relative_to(ROOT).as_posix()
+ return Path(filename).resolve().relative_to(ROOT).as_posix()
except ValueError:
# Not relative to root, just return original path.
return filename
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
