From 610da1b5d9b1380367123004367a2cb65eb52b57 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Date: Fri, 1 Jun 2012 20:33:29 +0400
Subject: [PATCH] Fixed completion for relatively imported submodule attributes
 (PY-6674)

---
 .../src/com/jetbrains/python/psi/types/PyModuleType.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/python/src/com/jetbrains/python/psi/types/PyModuleType.java b/python/src/com/jetbrains/python/psi/types/PyModuleType.java
index 2cb8d13feb9f..74e75957e946 100644
--- a/python/src/com/jetbrains/python/psi/types/PyModuleType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyModuleType.java
@@ -139,8 +139,11 @@ public class PyModuleType implements PyType { // Modules don't descend from obje
       }
     }
     if (!ResolveImportUtil.isAbsoluteImportEnabledFor(element)) {
-      final PyQualifiedName absoluteQName = ResolveImportUtil.findCanonicalImportPath(element, null);
-      final PsiFile file = element.getContainingFile();
+      PsiFile file = element.getContainingFile();
+      if (file != null) {
+        file = file.getOriginalFile();
+      }
+      final PyQualifiedName absoluteQName = ResolveImportUtil.findShortestImportableQName(file);
       if (file != null && absoluteQName != null) {
         final PyQualifiedName prefixQName = PyUtil.isPackage(file) ? absoluteQName : absoluteQName.removeLastComponent();
         if (prefixQName.getComponentCount() > 0) {