https://github.com/python/cpython/commit/25189188bfcb48be653eb9fb3aee892f2b9539b9
commit: 25189188bfcb48be653eb9fb3aee892f2b9539b9
branch: main
author: Jelle Zijlstra <[email protected]>
committer: JelleZijlstra <[email protected]>
date: 2024-09-26T21:37:21-07:00
summary:
generate_global_objects.py: Fix name of macro in error message (#124464)
_PyID does not exist but _Py_ID does.
files:
M Tools/build/generate_global_objects.py
diff --git a/Tools/build/generate_global_objects.py
b/Tools/build/generate_global_objects.py
index 882918fafb1edd..b5b6de0e7dc2dc 100644
--- a/Tools/build/generate_global_objects.py
+++ b/Tools/build/generate_global_objects.py
@@ -433,7 +433,7 @@ def get_identifiers_and_strings() -> 'tuple[set[str],
dict[str, str]]':
# Give a nice message for common mistakes.
# To cover tricky cases (like "\n") we also generate C asserts.
raise ValueError(
- 'do not use &_PyID or &_Py_STR for one-character latin-1 '
+ 'do not use &_Py_ID or &_Py_STR for one-character latin-1 '
+ f'strings, use _Py_LATIN1_CHR instead: {string!r}')
if string not in strings:
strings[string] = name
@@ -442,7 +442,7 @@ def get_identifiers_and_strings() -> 'tuple[set[str],
dict[str, str]]':
overlap = identifiers & set(strings.keys())
if overlap:
raise ValueError(
- 'do not use both _PyID and _Py_DECLARE_STR for the same string: '
+ 'do not use both _Py_ID and _Py_DECLARE_STR for the same string: '
+ repr(overlap))
return identifiers, strings
_______________________________________________
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]