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

Make sure that Tuple/Callable instances have the correct py__class__

Browse Source
This commit is contained in:
Dave Halter
2020-05-10 01:05:55 +02:00
parent f362932ec5
commit c2d1da09cb
4 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/inference/gradual/annotation.py
View File

@@ -12,7 +12,7 @@ from parso import ParserSyntaxError, parse
from jedi._compatibility import force_unicode, Parameter
from jedi.inference.cache import inference_state_method_cache
from jedi.inference.base_value import ValueSet, NO_VALUES
from jedi.inference.gradual.base import DefineGenericBase, GenericClass
from jedi.inference.gradual.base import DefineGenericBase, GenericClass, BaseTypingInstance
from jedi.inference.gradual.generics import TupleGenericManager
from jedi.inference.gradual.type_var import TypeVar
from jedi.inference.helpers import is_string
@@ -350,7 +350,7 @@ def merge_pairwise_generics(annotation_value, annotated_argument_class):
type_var_dict = {}
if not isinstance(annotated_argument_class, DefineGenericBase):
if not isinstance(annotated_argument_class, (DefineGenericBase, BaseTypingInstance)):
return type_var_dict
annotation_generics = annotation_value.get_generics()