From cab1ee3c406e3dcc416c9b72169db7813adff968 Mon Sep 17 00:00:00 2001 From: Paul Gammans Date: Wed, 26 Jul 2023 07:34:08 +0100 Subject: [PATCH] fix: replace use of dict_merge with basic implementation --- polymorphic/query.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/polymorphic/query.py b/polymorphic/query.py index 4d0ed0db..aa144e85 100644 --- a/polymorphic/query.py +++ b/polymorphic/query.py @@ -365,13 +365,13 @@ def apply_select_related(self, qs, relations): select_related = {} if isinstance(v, dict): if model_name in v: - select_related = dict_merge(select_related, v[model_name]) + select_related = merge_dicts(select_related, v[model_name]) else: for field in qs.model._meta.fields: if field.name in v: - select_related = dict_merge(select_related, v[field.name]) + select_related = merge_dicts(select_related, v[field.name]) else: - select_related = dict_merge(select_related, v) + select_related = merge_dicts(select_related, v) qs.query.select_related = select_related return qs @@ -942,13 +942,13 @@ def apply_select_related(self, qs, relation, filtered): if k == relation: if isinstance(v, dict): if model_name in v: - select_related = dict_merge(select_related, v[model_name]) + select_related = merge_dicts(select_related, v[model_name]) else: for field in qs.model._meta.fields: if field.name in v: - select_related = dict_merge(select_related, v[field.name]) + select_related = merge_dicts(select_related, v[field.name]) else: - select_related = dict_merge(select_related, v) + select_related = merge_dicts(select_related, v) else: select_related[k] = v