Merge branch 'master' of git@git.labs.intellij.net:idea/ultimate

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

@@ -93,7 +93,7 @@ public class ResolveImportUtil {
       return null;
     }
 
-    final PsiFile file = import_element.getContainingFile();
+    final PsiFile file = import_element.getContainingFile().getOriginalFile();
     final PyStatement importStatement = import_element.getContainingImportStatement();
 
     boolean absolute_import_enabled = isAbsoluteImportEnabledFor(import_element);

python/testData/completion/importModule.after.py

@@ -0,0 +1,3 @@
+import someModule
+
+class C(someModule.Xyzzy): pass

python/testData/completion/importModule.py

@@ -0,0 +1,3 @@
+import someModule
+
+class C(someModule.Xy<caret>): pass

python/testData/completion/someModule.py

@@ -0,0 +1 @@
+class Xyzzy: pass

python/testSrc/com/jetbrains/python/PythonCompletionTest.java

@@ -79,6 +79,13 @@ public class PythonCompletionTest extends PyLightFixtureTestCase {
     doTest();
   }
 
+  public void testImportModule() throws Exception {
+    final String testName = "completion/" + getTestName(true);
+    myFixture.configureByFiles(testName + ".py", "completion/someModule.py");
+    myFixture.completeBasic();
+    myFixture.checkResultByFile(testName + ".after.py");
+  }
+
   public void testPy255() throws Exception {
     final String dirname = "completion/";
     final String testName = dirname + "moduleClass";