.

Author: hauntsaninja

Python/ceval.c

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