import things declared in __init__.py

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

@@ -90,10 +90,13 @@ public class ResolveImportUtil {
       final PsiDirectory dir = (PsiDirectory)parent;
       final PsiFile file = dir.findFile(referencedName + ".py");
       if (file != null) return file;
-      return dir.findSubdirectory(referencedName);
-    }
-    else {
-      return null;
+      final PsiDirectory subdir = dir.findSubdirectory(referencedName);
+      if (subdir != null) return subdir;
+      final PsiFile initPy = dir.findFile("__init__.py");
+      if (initPy != null) {
+        return PyResolveUtil.treeWalkUp(new PyResolveUtil.ResolveProcessor(referencedName), initPy, null, importRef);
+      }
     }
+    return null;
   }
 }

python/testData/resolve/multiFile/fromInitPyImportFunction/FromInitPyImportFunction.py

@@ -0,0 +1,2 @@
+from mypackage import func
+#                      <ref>

python/testData/resolve/multiFile/fromInitPyImportFunction/mypackage/__init__.py

@@ -0,0 +1 @@
+def func(): pass

python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java

@@ -68,6 +68,11 @@ public class PyMultiFileResolveTest extends CodeInsightTestCase {
     assertEquals("testfile.py", ((PsiFile) element).getName());
   }
 
+  public void testFromInitPyImportFunction() throws Exception {
+    PsiElement element = doResolve();
+    assertTrue(element instanceof PyFunction);
+  }
+
   private PsiElement doResolve() throws Exception {
     String testName = getTestName(true);
     String fileName = getTestName(false) + ".py";