Don't let module __getattr__ shadow a module's own lazy imports

When a module attribute was a lazy import placeholder, module attribute
lookup called the module's __getattr__ before resolving it. This was
needed while lazy from-imports published placeholders on the source
module. That no longer happens, so the check only affected the module's
own lazy imports: a catch-all __getattr__ hid them, unlike eager imports.

Resolve the placeholder directly.

Author: brittanyrey

Lib/test/test_lazy_import/__init__.py

@@ -168,6 +168,16 @@ def test_from_import_with_imported_module_getattr(self):
         """)
         assert_python_ok("-c", code)
 
+    @support.requires_subprocess()
+    def test_module_getattr_does_not_shadow_own_lazy_import(self):
+        """Module __getattr__ should not shadow the module's own lazy imports."""
+        code = textwrap.dedent("""
+            import test.test_lazy_import.data.module_with_lazy_import_and_getattr as mod
+            assert mod.basic2.__name__ == "test.test_lazy_import.data.basic2"
+            assert mod.missing == "from_getattr:missing"
+        """)
+        assert_python_ok("-c", code)
+
 
 class GlobalLazyImportModeTests(LazyImportTestCase):
     """Tests for sys.set_lazy_imports() global mode control."""

Lib/test/test_lazy_import/data/module_with_lazy_import_and_getattr.py

@@ -0,0 +1,4 @@
+lazy import test.test_lazy_import.data.basic2 as basic2
+
+def __getattr__(name):
+    return f"from_getattr:{name}"

Objects/moduleobject.c

@@ -1362,29 +1362,6 @@ _Py_module_getattro_impl(PyModuleObject *m, PyObject *name, int suppress)
     }
     if (attr) {
         if (PyLazyImport_CheckExact(attr)) {
-            // gh-144957: Module __getattr__ should get a chance to provide
-            // the attribute before resolving a lazy import placeholder.
-            // Resolving __getattr__ itself must not invoke the hook.
-            getattr = NULL;
-            if (!_PyUnicode_EqualToASCIIString(name, "__getattr__") &&
-                module_get_resolved_dict_item(
-                    m->md_dict, &_Py_ID(__getattr__), &getattr) < 0) {
-                Py_DECREF(attr);
-                return NULL;
-            }
-            if (getattr) {
-                PyObject *result = PyObject_CallOneArg(getattr, name);
-                Py_DECREF(getattr);
-                if (result != NULL) {
-                    Py_DECREF(attr);
-                    return result;
-                }
-                if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
-                    Py_DECREF(attr);
-                    return NULL;
-                }
-                PyErr_Clear();
-            }
             PyThreadState *tstate = PyThreadState_GET();
             if (suppress && _PyLazyImport_IsResolving(tstate, attr)) {
                 // Only direct reentry means this attribute is unavailable.