1
0
forked from VimPlug/jedi

Remove dict merging where it doesn't do anything

These cases are all at the end of a single-path branch that ends
up "merging" against an empty mapping which is then returned
unchanged.
This commit is contained in:
Peter Law
2020-03-22 15:40:29 +00:00
parent f68d65ed59
commit ea33db388b
2 changed files with 9 additions and 21 deletions

View File

@@ -209,11 +209,8 @@ class GenericClass(ClassMixin, DefineGenericBase):
if annotation_name == 'Iterable' and not is_class_value:
given = self.get_generics()
if given:
merge_type_var_dicts(
type_var_dict,
given[0].infer_type_vars(
value_set.merge_types_of_iterate(),
),
return given[0].infer_type_vars(
value_set.merge_types_of_iterate(),
)
else:
# Note: we need to handle the MRO _in order_, so we need to extract