Update sys module to conform with the PEP, add matching C API

Author: DinoV

Doc/c-api/import.rst

@@ -333,3 +333,40 @@ Importing Modules
    strings instead of Python :class:`str` objects.
 
    .. versionadded:: 3.14
+
+.. c:function:: PyImport_LazyImportsMode PyImport_GetLazyImportsMode()
+
+   Gets the current lazy imports mode.
+
+   .. versionadded:: 3.15
+
+.. c:function:: PyObject* PyImport_GetLazyImportsFilter()
+
+   Gets the current lazy imports filter. Returns a new reference.
+
+   .. versionadded:: 3.15
+
+.. c:function:: PyObject* PyImport_SetLazyImportsMode(PyImport_LazyImportsMode mode)
+
+   Similar to :c:func:`PyImport_ImportModuleAttr`, but names are UTF-8 encoded
+   strings instead of Python :class:`str` objects.
+
+   .. versionadded:: 3.15
+
+.. c:function:: PyObject* PyImport_SetLazyImportsFilter(PyObject *filter)
+
+   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.
+
+   .. versionadded:: 3.15
+
+.. c:type:: PyImport_LazyImportsMode
+
+   Enumeration of possible lazy import modes:
+   - ``PyImport_LAZY_NORMAL``
+   - ``PyImport_LAZY_ALL``
+   - ``PyImport_LAZY_NONE``
+
+   .. versionadded:: 3.12

Include/import.h

@@ -89,14 +89,16 @@ PyAPI_FUNC(int) PyImport_AppendInittab(
     );
 
 typedef enum  {
-    PyLazyImportsMode_Default,
-    PyLazyImportsMode_ForcedOff,
-    PyLazyImportsMode_ForcedOn,
+    PyImport_LAZY_NORMAL,
+    PyImport_LAZY_ALL,
+    PyImport_LAZY_NONE,
 } PyImport_LazyImportsMode;
 
-PyAPI_FUNC(int) PyImport_SetLazyImports(PyImport_LazyImportsMode mode, PyObject *filter);
+PyAPI_FUNC(int) PyImport_SetLazyImportsMode(PyImport_LazyImportsMode mode);
+PyAPI_FUNC(int) PyImport_SetLazyImportsFilter(PyObject *filter);
 
-PyAPI_FUNC(PyImport_LazyImportsMode) PyImport_LazyImportsEnabled(void);
+PyAPI_FUNC(PyImport_LazyImportsMode) PyImport_GetLazyImportsMode(void);
+PyAPI_FUNC(PyObject *) PyImport_GetLazyImportsFilter(void);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_IMPORT_H

Include/internal/pycore_global_objects_fini_generated.h

@@ -427,6 +427,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(effective_ids)
         STRUCT_FOR_ID(element_factory)
         STRUCT_FOR_ID(emptyerror)
+        STRUCT_FOR_ID(enabled)
         STRUCT_FOR_ID(encode)
         STRUCT_FOR_ID(encoding)
         STRUCT_FOR_ID(end)

Include/internal/pycore_global_strings.h

@@ -59,8 +59,6 @@
 
 from ._bootstrap import __import__
 
-from _imp import set_lazy_imports
-
 
 def invalidate_caches():
     """Call the invalidate_caches() method on all meta path finders stored in

Include/internal/pycore_runtime_init_generated.h

@@ -2548,7 +2548,8 @@ def tearDown(self):
             if key.startswith('test.test_import.data.lazy_imports'):
                 del sys.modules[key]
 
-        importlib.set_lazy_imports(None, None)
+        sys.set_lazy_imports_filter(None)
+        sys.set_lazy_imports(None)
 
     def test_basic_unused(self):
         try:
@@ -2738,7 +2739,7 @@ def test_lazy_try_except_from_star(self):
             import test.test_import.data.lazy_imports.lazy_try_except_from_star
 
     def test_try_except_eager(self):
-        importlib.set_lazy_imports(True)
+        sys.set_lazy_imports(True)
         try:
             import test.test_import.data.lazy_imports.try_except_eager
         except ImportError as e:
@@ -2747,7 +2748,7 @@ def test_try_except_eager(self):
         self.assertTrue("test.test_import.data.lazy_imports.basic2" in sys.modules)
 
     def test_try_except_eager_from(self):
-        importlib.set_lazy_imports(True)
+        sys.set_lazy_imports(True)
         try:
             import test.test_import.data.lazy_imports.try_except_eager_from
         except ImportError as e:
@@ -2759,8 +2760,8 @@ def test_lazy_import_func(self):
         with self.assertRaises(SyntaxError):
             import test.test_import.data.lazy_imports.lazy_import_func
 
-    def test_eager_import_func(self):
-        importlib.set_lazy_imports(True)
+    def test_eager_import_func(self):        
+        sys.set_lazy_imports(True)
         try:
             import test.test_import.data.lazy_imports.eager_import_func
         except ImportError as e:

Include/internal/pycore_unicodeobject_generated.h

@@ -1,10 +1,10 @@
-import importlib
+import sys
 
 def filter(module_name, imported_name, from_list):
     assert module_name == __name__
     assert imported_name == "test.test_import.data.lazy_imports.basic2"
     return False
 
-importlib.set_lazy_imports(None, filter)
+sys.set_lazy_imports_filter(filter)
 
 lazy import test.test_import.data.lazy_imports.basic2 as basic2

Lib/importlib/__init__.py

@@ -1,10 +1,11 @@
-import importlib
+import sys
 
 def filter(module_name, imported_name, from_list):
     assert module_name == __name__
     assert imported_name == "test.test_import.data.lazy_imports.basic2"
     return True
 
-importlib.set_lazy_imports(None, filter)
+sys.set_lazy_imports(None)
+sys.set_lazy_imports_filter(filter)
 
 lazy import test.test_import.data.lazy_imports.basic2 as basic2