From 07477f26df2c254b8175418aebe28aafc8d0feff Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 13 Dec 2010 16:11:49 +0300
Subject: [PATCH] fix exception from auto-import (PY-2445)

---
 .../com/jetbrains/python/actions/AddImportHelper.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/actions/AddImportHelper.java b/python/src/com/jetbrains/python/actions/AddImportHelper.java
index 96a687e6b85c..6ac9157aab54 100644
--- a/python/src/com/jetbrains/python/actions/AddImportHelper.java
+++ b/python/src/com/jetbrains/python/actions/AddImportHelper.java
@@ -91,7 +91,14 @@ public class AddImportHelper {
     if (relativeToName == null) {
       return false;
     }
-    ImportPriority relativeToPriority = source == null ? ImportPriority.BUILTIN : getImportPriority(file, source.getContainingFile());
+    final PsiFileSystemItem containingFile;
+    if (source instanceof PsiDirectory) {
+      containingFile = (PsiDirectory) source;
+    }
+    else {
+      containingFile = source != null ? source.getContainingFile() : null;
+    }
+    ImportPriority relativeToPriority = source == null ? ImportPriority.BUILTIN : getImportPriority(file, containingFile);
     final int rc = priority.compareTo(relativeToPriority);
     if (rc < 0) {
       return true;