VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Make sure py__get__ is applied properly for Django metaclasses

Browse Source
This commit is contained in:
Dave Halter
2020-06-07 15:01:12 +02:00
parent 9adcf3d233
commit c9a21adc5f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/inference/value/klass.py
View File

@@ -189,7 +189,8 @@ class ClassMixin(object):
mro.append(cls_new) mro.append(cls_new)
yield cls_new yield cls_new
def get_filters(self, origin_scope=None, is_instance=False, include_metaclasses=True): def get_filters(self, origin_scope=None, is_instance=False,
include_metaclasses=True, include_type_when_class=True):
if include_metaclasses: if include_metaclasses:
metaclasses = self.get_metaclasses() metaclasses = self.get_metaclasses()
if metaclasses: if metaclasses:
@@ -206,7 +207,7 @@ class ClassMixin(object):
origin_scope=origin_scope, origin_scope=origin_scope,
is_instance=is_instance is_instance=is_instance
) )
if not is_instance: if not is_instance and include_type_when_class:
from jedi.inference.compiled import builtin_from_name from jedi.inference.compiled import builtin_from_name
type_ = builtin_from_name(self.inference_state, u'type') type_ = builtin_from_name(self.inference_state, u'type')
assert isinstance(type_, ClassValue) assert isinstance(type_, ClassValue)

6
jedi/plugins/django.py
View File

@@ -154,7 +154,11 @@ def _new_dict_filter(cls, is_instance):
if manager: if manager:
return manager.name return manager.name
filters = list(cls.get_filters(is_instance=True, include_metaclasses=False)) filters = list(cls.get_filters(
is_instance=is_instance,
include_metaclasses=False,
include_type_when_class=False)
)
dct = { dct = {
name.string_name: DjangoModelName(cls, name, is_instance) name.string_name: DjangoModelName(cls, name, is_instance)
for filter_ in reversed(filters) for filter_ in reversed(filters)