Merge branch 'master' into project

2020-02-04 23:56:47 +01:00
parent 670d6e8639 7a55484b79
commit b7919bd3e6
2 changed files with 6 additions and 6 deletions
--- a/jedi/inference/gradual/annotation.py
+++ b/jedi/inference/gradual/annotation.py
@@ -285,7 +285,7 @@ def infer_return_for_callable(arguments, param_values, result_values):
            all_type_vars.update(type_var_dict)

    return ValueSet.from_sets(
-        v.define_generics(type_var_dict)
+        v.define_generics(all_type_vars)
        if isinstance(v, (DefineGenericBase, TypeVar)) else ValueSet({v})
        for v in result_values
    ).execute_annotation()