fix relative import tests

timfel · timfel · commit 5f461b00ad16 · 2021-06-05T05:40:03.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java
@@ -433,7 +433,7 @@ String resolveName(VirtualFrame frame, String name, Object globals, int level,
             }
 
             for (int levelUp = 1; levelUp < level; levelUp += 1) {
-                lastDotIdx = pkgString.lastIndexOf('.', lastDotIdx);
+                lastDotIdx = pkgString.lastIndexOf('.', lastDotIdx - 1);
                 if (lastDotIdx == -1) {
                     throw PConstructAndRaiseNode.getUncached().raiseImportError(frame, "attempted relative import beyond top-level package");
                 }

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ String resolveName(VirtualFrame frame, String name, Object globals, int level,`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`for (int levelUp = 1; levelUp < level; levelUp += 1) {`
`436`		`- lastDotIdx = pkgString.lastIndexOf('.', lastDotIdx);`
	`436`	`+ lastDotIdx = pkgString.lastIndexOf('.', lastDotIdx - 1);`
`437`	`437`	`if (lastDotIdx == -1) {`
`438`	`438`	`throw PConstructAndRaiseNode.getUncached().raiseImportError(frame, "attempted relative import beyond top-level package");`
`439`	`439`	`}`