GH-90699: Remove remaining _Py_IDENTIFIER stdlib usage (GH-99067)

Include/internal/pycore_global_strings.h

@@ -11,17 +11,17 @@ extern "C" {
 // The data structure & init here are inspired by Tools/build/deepfreeze.py.
 
 // All field names generated by ASCII_STR() have a common prefix,
-// to help avoid collisions with keywords, etc.
+// to help avoid collisions with keywords, macros, etc.
 
 #define STRUCT_FOR_ASCII_STR(LITERAL) \
     struct { \
         PyASCIIObject _ascii; \
         uint8_t _data[sizeof(LITERAL)]; \
     }
 #define STRUCT_FOR_STR(NAME, LITERAL) \
-    STRUCT_FOR_ASCII_STR(LITERAL) _ ## NAME;
+    STRUCT_FOR_ASCII_STR(LITERAL) _py_ ## NAME;
 #define STRUCT_FOR_ID(NAME) \
-    STRUCT_FOR_ASCII_STR(#NAME) _ ## NAME;
+    STRUCT_FOR_ASCII_STR(#NAME) _py_ ## NAME;
 
 // XXX Order by frequency of use?
 
@@ -246,6 +246,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(_showwarnmsg)
         STRUCT_FOR_ID(_shutdown)
         STRUCT_FOR_ID(_slotnames)
+        STRUCT_FOR_ID(_strptime_datetime)
         STRUCT_FOR_ID(_swappedbytes_)
         STRUCT_FOR_ID(_type_)
         STRUCT_FOR_ID(_uninitialized_submodules)
@@ -264,6 +265,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(argdefs)
         STRUCT_FOR_ID(arguments)
         STRUCT_FOR_ID(argv)
+        STRUCT_FOR_ID(as_integer_ratio)
         STRUCT_FOR_ID(attribute)
         STRUCT_FOR_ID(authorizer_callback)
         STRUCT_FOR_ID(b)
@@ -403,6 +405,8 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(frequency)
         STRUCT_FOR_ID(from_param)
         STRUCT_FOR_ID(fromlist)
+        STRUCT_FOR_ID(fromtimestamp)
+        STRUCT_FOR_ID(fromutc)
         STRUCT_FOR_ID(fset)
         STRUCT_FOR_ID(func)
         STRUCT_FOR_ID(future)
@@ -448,6 +452,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(intersection)
         STRUCT_FOR_ID(isatty)
         STRUCT_FOR_ID(isinstance)
+        STRUCT_FOR_ID(isoformat)
         STRUCT_FOR_ID(isolation_level)
         STRUCT_FOR_ID(istext)
         STRUCT_FOR_ID(item)
@@ -636,6 +641,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(step)
         STRUCT_FOR_ID(store_name)
         STRUCT_FOR_ID(strategy)
+        STRUCT_FOR_ID(strftime)
         STRUCT_FOR_ID(strict)
         STRUCT_FOR_ID(strict_mode)
         STRUCT_FOR_ID(string)
@@ -658,6 +664,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(throw)
         STRUCT_FOR_ID(timeout)
         STRUCT_FOR_ID(times)
+        STRUCT_FOR_ID(timetuple)
         STRUCT_FOR_ID(top)
         STRUCT_FOR_ID(trace_callback)
         STRUCT_FOR_ID(traceback)
@@ -669,6 +676,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(txt)
         STRUCT_FOR_ID(type)
         STRUCT_FOR_ID(tz)
+        STRUCT_FOR_ID(tzname)
         STRUCT_FOR_ID(uid)
         STRUCT_FOR_ID(unlink)
         STRUCT_FOR_ID(unraisablehook)
@@ -708,9 +716,9 @@ struct _Py_global_strings {
 
 
 #define _Py_ID(NAME) \
-     (_Py_SINGLETON(strings.identifiers._ ## NAME._ascii.ob_base))
+     (_Py_SINGLETON(strings.identifiers._py_ ## NAME._ascii.ob_base))
 #define _Py_STR(NAME) \
-     (_Py_SINGLETON(strings.literals._ ## NAME._ascii.ob_base))
+     (_Py_SINGLETON(strings.literals._py_ ## NAME._ascii.ob_base))
 
 /* _Py_DECLARE_STR() should precede all uses of _Py_STR() in a function.
 

Include/internal/pycore_runtime_init.h

@@ -110,9 +110,9 @@ extern "C" {
         ._data = (LITERAL) \
     }
 #define INIT_STR(NAME, LITERAL) \
-    ._ ## NAME = _PyASCIIObject_INIT(LITERAL)
+    ._py_ ## NAME = _PyASCIIObject_INIT(LITERAL)
 #define INIT_ID(NAME) \
-    ._ ## NAME = _PyASCIIObject_INIT(#NAME)
+    ._py_ ## NAME = _PyASCIIObject_INIT(#NAME)
 #define _PyUnicode_LATIN1_INIT(LITERAL, UTF8) \
     { \
         ._latin1 = { \