Use _Py_ID() in _warnings.c.

python · ericsnowcurrently · Feb 23, 2022 · Feb 16, 2022 · Feb 16, 2022 · Feb 16, 2022
commit 42b714ffa5b421bc157ed02448ac8b05014ba02f
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
@@ -198,6 +198,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(__xor__)
         STRUCT_FOR_ID(_abc_impl)
         STRUCT_FOR_ID(_blksize)
+        STRUCT_FOR_ID(_bootstrap)
         STRUCT_FOR_ID(_dealloc_warn)
         STRUCT_FOR_ID(_finalizing)
         STRUCT_FOR_ID(_find_and_load)

@@ -813,6 +813,7 @@ extern "C" {
                 INIT_ID(__xor__), \
                 INIT_ID(_abc_impl), \
                 INIT_ID(_blksize), \
+                INIT_ID(_bootstrap), \
                 INIT_ID(_dealloc_warn), \
                 INIT_ID(_finalizing), \
                 INIT_ID(_find_and_load), \

diff --git a/Python/_warnings.c b/Python/_warnings.c
@@ -768,25 +768,6 @@ warn_explicit(PyThreadState *tstate, PyObject *category, PyObject *message,
 static int
 is_internal_frame(PyFrameObject *frame)
 {
-    static PyObject *importlib_string = NULL;
-    static PyObject *bootstrap_string = NULL;
-    int contains;
-
-    if (importlib_string == NULL) {
-        importlib_string = PyUnicode_FromString("importlib");
-        if (importlib_string == NULL) {
-            return 0;
-        }
-
-        bootstrap_string = PyUnicode_FromString("_bootstrap");
-        if (bootstrap_string == NULL) {
-            Py_DECREF(importlib_string);
-            return 0;
-        }
-        Py_INCREF(importlib_string);
-        Py_INCREF(bootstrap_string);
-    }
-
     if (frame == NULL) {
         return 0;
     }
@@ -802,12 +783,12 @@ is_internal_frame(PyFrameObject *frame)
         return 0;
     }
 
-    contains = PyUnicode_Contains(filename, importlib_string);
+    int contains = PyUnicode_Contains(filename, &_Py_ID(importlib));
     if (contains < 0) {
         return 0;
     }
     else if (contains > 0) {
-        contains = PyUnicode_Contains(filename, bootstrap_string);
+        contains = PyUnicode_Contains(filename, &_Py_ID(_bootstrap));
         if (contains < 0) {
             return 0;
         }

@@ -281,10 +281,6 @@ Objects/sliceobject.c	-	_Py_EllipsisObject	-
 
 # manually cached PyUnicodeObject
 # XXX This should have been found by the analyzer but wasn't:
-Python/_warnings.c	is_internal_frame	bootstrap_string	-
-# XXX This should have been found by the analyzer but wasn't:
-Python/_warnings.c	is_internal_frame	importlib_string	-
-# XXX This should have been found by the analyzer but wasn't:
 Python/ast_unparse.c	-	_str_close_br	-
 # XXX This should have been found by the analyzer but wasn't:
 Python/ast_unparse.c	-	_str_dbl_close_br	-