MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix processing six.with_metaclass and six.add_metaclass reimported through Django

Browse Source
This commit is contained in:
Semyon Proshev
2018-04-10 22:18:30 +03:00
parent 7f2e3f0db2
commit 7041d0ec61
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
+8 -2
View File
@@ -194,7 +194,10 @@ public class PyClassImpl extends PyBaseElementImpl<PyClassStub> implements PyCla
if (callee instanceof PyReferenceExpression) {
final QualifiedName sixWithMetaclass = QualifiedName.fromComponents("six", "with_metaclass");
return PyResolveUtil.resolveImportedElementQNameLocally((PyReferenceExpression)callee).contains(sixWithMetaclass);
final QualifiedName djangoWithMetaclass = QualifiedName.fromDottedString("django.utils.six.with_metaclass");
return ContainerUtil.exists(PyResolveUtil.resolveImportedElementQNameLocally((PyReferenceExpression)callee),
name -> name.equals(sixWithMetaclass) || name.equals(djangoWithMetaclass));
}
}
@@ -1614,7 +1617,10 @@ public class PyClassImpl extends PyBaseElementImpl<PyClassStub> implements PyCla
if (callee instanceof PyReferenceExpression) {
final QualifiedName sixAddMetaclass = QualifiedName.fromComponents("six", "add_metaclass");
return PyResolveUtil.resolveImportedElementQNameLocally((PyReferenceExpression)callee).contains(sixAddMetaclass);
final QualifiedName djangoAddMetaclass = QualifiedName.fromDottedString("django.utils.six.add_metaclass");
return ContainerUtil.exists(PyResolveUtil.resolveImportedElementQNameLocally((PyReferenceExpression)callee),
name -> name.equals(sixAddMetaclass) || name.equals(djangoAddMetaclass));
}
return false;