From 3e0697844f30e3e86121e0e7743b0bcc15cfb0da Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 23 Sep 2010 13:40:04 +0400 Subject: [PATCH] fix from dcherysasov --- .../src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java b/python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java index a81b3fb83863..f62b750de465 100644 --- a/python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java +++ b/python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java @@ -544,7 +544,7 @@ public class ResolveImportUtil { // OTOH, quite often a module named foo exports a class or function named foo, which is used as a fallback // by a module one level higher (e.g. curses.set_key). Prefer it to submodule if possible. ret = ((PyFile)parent).getElementNamed(referencedName); - if (PyUtil.instanceOf(ret, PyFunction.class, PyClass.class)) return ret; + if (ret != null && !PyUtil.instanceOf(ret, PsiFile.class, PsiDirectory.class)) return ret; if (possible_ret != null) return possible_ret; } else if (parent instanceof PsiDirectory) {