pythongh-128030: Avoid error from PyModule_GetFilenameObject for non-module

I missed the extra `PyModule_Check` in python#127660 because I was looking at
3.12 as the base implementation for import from. This meant that I
missed the `PyModuleCheck` introduced in python#112661.

Author: hauntsaninja

Lib/test/test_import/__init__.py

@@ -851,6 +851,29 @@ def test_frozen_module_from_import_error(self):
                 stdout, stderr = popen.communicate()
                 self.assertIn(expected_error, stdout)
 
+    def test_non_module_from_import_error(self):
+        prefix = """
+import sys
+class NotAModule: ...
+nm = NotAModule()
+nm.symbol = 123
+sys.modules["not_a_module"] = nm
+from not_a_module import symbol
+"""
+        scripts = [
+            prefix + "from not_a_module import missing_symbol",
+            prefix + "nm.__spec__ = []\nfrom not_a_module import missing_symbol",
+        ]
+        for script in scripts:
+            with self.subTest(script=script):
+                expected_error = (
+                    b"ImportError: cannot import name 'missing_symbol' from "
+                    b"'<unknown module name>' (unknown location)"
+                )
+            popen = script_helper.spawn_python("-c", script)
+            stdout, stderr = popen.communicate()
+            self.assertIn(expected_error, stdout)
+
     def test_script_shadowing_stdlib(self):
         script_errors = [
             (

Python/ceval.c

@@ -2863,13 +2863,15 @@ _PyEval_ImportFrom(PyThreadState *tstate, PyObject *v, PyObject *name)
     if (origin == NULL) {
         // Fall back to __file__ for diagnostics if we don't have
         // an origin that is a location
-        origin = PyModule_GetFilenameObject(v);
-        if (origin == NULL) {
-            if (!PyErr_ExceptionMatches(PyExc_SystemError)) {
-                goto done;
+        if (PyModule_Check(v)) {
+            origin = PyModule_GetFilenameObject(v);
+            if (origin == NULL) {
+                if (!PyErr_ExceptionMatches(PyExc_SystemError)) {
+                    goto done;
+                }
+                // PyModule_GetFilenameObject raised "module filename missing"
+                _PyErr_Clear(tstate);
             }
-            // PyModule_GetFilenameObject raised "module filename missing"
-            _PyErr_Clear(tstate);
         }
         assert(origin == NULL || PyUnicode_Check(origin));
     }