Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Flame: Fix default argument value in custom dictionary #2339

Merged
merged 2 commits into from
Dec 2, 2021
Merged

Flame: Fix default argument value in custom dictionary #2339

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20d5ac6
fix pop with defying object out of pop scope
iLLiCiTiT Nov 29, 2021
bf70406
do the pop without dummy object
iLLiCiTiT Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions openpype/hosts/flame/api/lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,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=object()):
if v is object():
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)
Expand Down