Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dmitry Jemerov
2012-08-16 08:29:20 +02:00
8 changed files with 172 additions and 36 deletions
@@ -181,7 +181,10 @@ public class PyDynamicMember {
if (myTypeCallback != null) {
return myTypeCallback.fun(myContext);
}
return PyPsiFacade.getInstance(getProject()).createClassType(myClass, !myResolveToInstance);
else if (myClass != null) {
return PyPsiFacade.getInstance(getProject()).createClassType(myClass, !myResolveToInstance);
}
return null;
}
}
}