From 494424c8eaa34dd70d1abd1233cdd354153df998 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Thu, 12 Dec 2019 17:42:46 +0000 Subject: [PATCH] utils/types: Fix ParameterDict update method. When updating a ParameterDict with another ParameterDict the unencoded values were being merged. Ensure consistent behaviour by implicitally iterating via `__iter__` which will cause ParameterDict values to be decoded before being re-endcoded as expected. --- wa/utils/types.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/wa/utils/types.py b/wa/utils/types.py index a29b00a1..a852ad09 100644 --- a/wa/utils/types.py +++ b/wa/utils/types.py @@ -782,11 +782,8 @@ class ParameterDict(dict): def update(self, *args, **kwargs): for d in list(args) + [kwargs]: - if isinstance(d, ParameterDict): - dict.update(self, d) - else: - for k, v in d.items(): - self[k] = v + for k, v in d: + self[k] = v class cpu_mask(object):