Fix FromImport module name handling

msimacek · msimacek · commit 3424d96053de · 2022-07-27T11:16:58.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/ImportFromNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/ImportFromNode.java
@@ -117,7 +117,7 @@ private Object tryResolveCircularImport(Object module, TruffleString name) {
             throw PConstructAndRaiseNode.getUncached().raiseImportError(null, pkgnameObj, pkgpathObj, ErrorMessages.CANNOT_IMPORT_NAME_CIRCULAR, name, pkgname, pkgpath);
         } else {
             if (pkgpathObj == null) {
-                pkgnameObj = PNone.NONE;
+                pkgpathObj = PNone.NONE;
             }
             throw PConstructAndRaiseNode.getUncached().raiseImportError(null, pkgnameObj, pkgpathObj, ErrorMessages.CANNOT_IMPORT_NAME, name, pkgname, pkgpath);
         }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private Object tryResolveCircularImport(Object module, TruffleString name) {`
`117`	`117`	`throw PConstructAndRaiseNode.getUncached().raiseImportError(null, pkgnameObj, pkgpathObj, ErrorMessages.CANNOT_IMPORT_NAME_CIRCULAR, name, pkgname, pkgpath);`
`118`	`118`	`} else {`
`119`	`119`	`if (pkgpathObj == null) {`
`120`		`- pkgnameObj = PNone.NONE;`
	`120`	`+ pkgpathObj = PNone.NONE;`
`121`	`121`	`}`
`122`	`122`	`throw PConstructAndRaiseNode.getUncached().raiseImportError(null, pkgnameObj, pkgpathObj, ErrorMessages.CANNOT_IMPORT_NAME, name, pkgname, pkgpath);`
`123`	`123`	`}`