PY-7376 Resolving of relative imports takes into account namespace packages

python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java

@@ -95,7 +95,7 @@ public class ResolveImportUtil {
       base = base.getOriginalFile(); // just to make sure
       result = base.getContainingDirectory();
       int count = 1;
-      while (result != null && result.findFile(PyNames.INIT_DOT_PY) != null) {
+      while (result != null && PyUtil.isPackage(result, base)) {
         if (count >= depth) return result;
         result = result.getParentDirectory();
         count += 1;

python/testData/completion/relativeFromImportInNamespacePackage/nspkg1/a.after.py

@@ -0,0 +1 @@
+from .nspkg2 import foo

python/testData/completion/relativeFromImportInNamespacePackage/nspkg1/a.py

@@ -0,0 +1 @@
+from .nspkg2 import f<caret>

python/testData/completion/relativeFromImportInNamespacePackage2/nspkg1/a.after.py

@@ -0,0 +1 @@
+from . import foo

python/testData/completion/relativeFromImportInNamespacePackage2/nspkg1/a.py

@@ -0,0 +1 @@
+from . import f<caret>

python/testSrc/com/jetbrains/python/Py3CompletionTest.java

@@ -119,4 +119,21 @@ public class Py3CompletionTest extends PyTestCase {
   public void testImportNestedQualifiedNamespacePackage() {
     doMultiFileTest();
   }
+
+  // PY-7376
+  public void testRelativeFromImportInNamespacePackage() {
+    doMultiFileTestInsideNamespacePackage();
+  }
+
+  // PY-7376
+  public void testRelativeFromImportInNamespacePackage2() {
+    doMultiFileTestInsideNamespacePackage();
+  }
+
+  private void doMultiFileTestInsideNamespacePackage() {
+    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.configureByFile("nspkg1/a.py");
+    myFixture.completeBasic();
+    myFixture.checkResultByFile("completion/" + getTestName(true) + "/nspkg1/a.after.py");
+  }
 }