Address feedback

Author: pablogsal

Doc/c-api/import.rst

@@ -349,7 +349,7 @@ Importing Modules
 
 .. c:function:: PyObject* PyImport_GetLazyImportsFilter()
 
-   Gets the current lazy imports filter. Returns a new reference.
+   Gets the current lazy imports filter. Returns a :term:`strong reference`.
 
    .. versionadded:: next
 
@@ -364,17 +364,18 @@ Importing Modules
 
    Sets the current lazy imports filter. The function should be a callable that
    will receive (importing_module_name, imported_module_name, [fromlist]) when
-   an import can potentially be lazy. Returns True if the import should be lazy
-   or False otherwise.
+   an import can potentially be lazy. Returns ``True`` if the import should be lazy
+   or ``False`` otherwise.
 
    .. versionadded:: next
 
 .. c:type:: PyImport_LazyImportsMode
 
    Enumeration of possible lazy import modes:
-   - ``PyImport_LAZY_NORMAL``
-   - ``PyImport_LAZY_ALL``
-   - ``PyImport_LAZY_NONE``
+
+   - :c:enumerator:`PyImport_LAZY_NORMAL`
+   - :c:enumerator:`PyImport_LAZY_ALL`
+   - :c:enumerator:`PyImport_LAZY_NONE`
 
    .. versionadded:: next
 

Grammar/python.gram

@@ -121,7 +121,7 @@ simple_stmts[asdl_stmt_seq*]:
 simple_stmt[stmt_ty] (memo):
     | assignment
     | &"type" type_alias
-    | &('import' | 'from' | "lazy" ) import_stmt
+    | &('import' | 'from' | "lazy") import_stmt
     | e=star_expressions { _PyAST_Expr(e, EXTRA) }
     | &'return' return_stmt
     | &'raise' raise_stmt

Lib/types.py

@@ -76,6 +76,10 @@ def _m(self): pass
     # CapsuleType cannot be accessed from pure Python,
     # so there is no fallback definition.
 
+    exec("lazy import sys as _lazy_sys", _lz := {})
+    LazyImportType = type(_lz['_lazy_sys'])
+    del _lz
+
     del sys, _f, _g, _C, _c, _ag, _cell_factory  # Not for export
 
 

Objects/lazyimportobject.c

@@ -23,12 +23,9 @@ _PyLazyImport_New(PyObject *builtins, PyObject *from, PyObject *attr)
     if (m == NULL) {
         return NULL;
     }
-    Py_XINCREF(builtins);
-    m->lz_builtins = builtins;
-    Py_INCREF(from);
-    m->lz_from = from;
-    Py_XINCREF(attr);
-    m->lz_attr = attr;
+    m->lz_builtins = Py_XNewRef(builtins);
+    m->lz_from = Py_NewRef(from);
+    m->lz_attr = Py_XNewRef(attr);
 
     /* Capture frame information for the original import location */
     m->lz_code = NULL;
@@ -44,18 +41,35 @@ _PyLazyImport_New(PyObject *builtins, PyObject *from, PyObject *attr)
         }
     }
 
-    PyObject_GC_Track(m);
+    _PyObject_GC_TRACK(m);
     return (PyObject *)m;
 }
 
+static int
+lazy_import_traverse(PyLazyImportObject *m, visitproc visit, void *arg)
+{
+    Py_VISIT(m->lz_builtins);
+    Py_VISIT(m->lz_from);
+    Py_VISIT(m->lz_attr);
+    Py_VISIT(m->lz_code);
+    return 0;
+}
+
+static int
+lazy_import_clear(PyLazyImportObject *m)
+{
+    Py_CLEAR(m->lz_builtins);
+    Py_CLEAR(m->lz_from);
+    Py_CLEAR(m->lz_attr);
+    Py_CLEAR(m->lz_code);
+    return 0;
+}
+
 static void
 lazy_import_dealloc(PyLazyImportObject *m)
 {
-    PyObject_GC_UnTrack(m);
-    Py_XDECREF(m->lz_builtins);
-    Py_XDECREF(m->lz_from);
-    Py_XDECREF(m->lz_attr);
-    Py_XDECREF(m->lz_code);
+    _PyObject_GC_UNTRACK(m);
+    lazy_import_clear(m);
     Py_TYPE(m)->tp_free((PyObject *)m);
 }
 
@@ -85,26 +99,6 @@ lazy_import_repr(PyLazyImportObject *m)
     return res;
 }
 
-static int
-lazy_import_traverse(PyLazyImportObject *m, visitproc visit, void *arg)
-{
-    Py_VISIT(m->lz_builtins);
-    Py_VISIT(m->lz_from);
-    Py_VISIT(m->lz_attr);
-    Py_VISIT(m->lz_code);
-    return 0;
-}
-
-static int
-lazy_import_clear(PyLazyImportObject *m)
-{
-    Py_CLEAR(m->lz_builtins);
-    Py_CLEAR(m->lz_from);
-    Py_CLEAR(m->lz_attr);
-    Py_CLEAR(m->lz_code);
-    return 0;
-}
-
 static PyObject *
 lazy_import_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {

Objects/moduleobject.c

@@ -51,7 +51,6 @@ assert_def_missing_or_redundant(PyModuleObject *m)
 }
 
 
-
 PyTypeObject PyModuleDef_Type = {
     PyVarObject_HEAD_INIT(&PyType_Type, 0)
     "moduledef",                                /* tp_name */

Programs/test_frozenmain.h

@@ -307,7 +307,7 @@ static PyObject *
 builtin___lazy_import___impl(PyObject *module, PyObject *name,
                              PyObject *globals, PyObject *locals,
                              PyObject *fromlist, int level)
-/*[clinic end generated code: output=300f1771094b9e8c input=57123e246d6c36ee]*/
+/*[clinic end generated code: output=300f1771094b9e8c input=9394874f340b2948]*/
 {
     PyObject *builtins;
     PyThreadState *tstate = PyThreadState_GET();
@@ -318,11 +318,14 @@ builtin___lazy_import___impl(PyObject *module, PyObject *name,
         locals = globals;
     }
 
-    builtins = PyMapping_GetItemString(globals, "__builtins__");
+    if (PyDict_GetItemRef(globals, &_Py_ID(__builtins__), &builtins) < 0) {
+        return NULL;
+    }
     if (builtins == NULL) {
         PyErr_SetString(PyExc_ValueError, "unable to get builtins for lazy import");
         return NULL;
-    } else if (PyModule_Check(builtins)) {
+    }
+    if (PyModule_Check(builtins)) {
         PyObject *builtins_dict = Py_XNewRef(PyModule_GetDict(builtins));
         if (builtins_dict == NULL) {
             PyErr_SetString(PyExc_AttributeError, "builtins module has no dict");