From 20d5ac6ccb76862e459b5ca056116376366781b8 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 29 Nov 2021 18:29:50 +0100 Subject: [PATCH 1/2] fix pop with defying object out of pop scope --- openpype/hosts/flame/api/lib.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openpype/hosts/flame/api/lib.py b/openpype/hosts/flame/api/lib.py index 48331dcbc28..f6eb0c59e7b 100644 --- a/openpype/hosts/flame/api/lib.py +++ b/openpype/hosts/flame/api/lib.py @@ -8,6 +8,9 @@ log = Logger().get_logger(__name__) +# Dumb object to know if argument was passed where None is valid value +_dumb_obj = object() + @contextlib.contextmanager def io_preferences_file(klass, filepath, write=False): @@ -47,8 +50,8 @@ def get(self, k, default=None): def setdefault(self, k, default=None): return self.master[self.name].setdefault(k, default) - def pop(self, k, v=object()): - if v is object(): + def pop(self, k, v=_dumb_obj): + if v is _dumb_obj: return self.master[self.name].pop(k) return self.master[self.name].pop(k, v) From bf704068c1c7bd1f207d2e4950c39b80ddce3a2a Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 1 Dec 2021 11:17:13 +0100 Subject: [PATCH 2/2] do the pop without dummy object --- openpype/hosts/flame/api/lib.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/openpype/hosts/flame/api/lib.py b/openpype/hosts/flame/api/lib.py index f6eb0c59e7b..89e020b329d 100644 --- a/openpype/hosts/flame/api/lib.py +++ b/openpype/hosts/flame/api/lib.py @@ -8,9 +8,6 @@ log = Logger().get_logger(__name__) -# Dumb object to know if argument was passed where None is valid value -_dumb_obj = object() - @contextlib.contextmanager def io_preferences_file(klass, filepath, write=False): @@ -50,10 +47,8 @@ def get(self, k, default=None): def setdefault(self, k, default=None): return self.master[self.name].setdefault(k, default) - def pop(self, k, v=_dumb_obj): - if v is _dumb_obj: - return self.master[self.name].pop(k) - return self.master[self.name].pop(k, v) + def pop(self, *args, **kwargs): + return self.master[self.name].pop(*args, **kwargs) def update(self, mapping=(), **kwargs): self.master[self.name].update(mapping, **kwargs)