public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-09-01 00:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #21 from styxtwo/upstream

Browse source 
Merge nested configs instead of overriding
This commit is contained in:
Grant Sanderson 2017-04-17 10:21:58 -07:00 • committed by GitHub
commit 14d2d8fecb
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
helpers.py
View file

@ -229,7 +229,6 @@ def filtered_locals(local_args):
result.pop(arg, local_args) result.pop(arg, local_args)
return result return result
def digest_config(obj, kwargs, local_args = {}): def digest_config(obj, kwargs, local_args = {}):
""" """
Sets init args and CONFIG values as local variables Sets init args and CONFIG values as local variables
@ -240,19 +239,31 @@ def digest_config(obj, kwargs, local_args = {}):
as an attribute of the object. as an attribute of the object.
""" """
### Assemble list of CONFIGs from all super classes ### Assemble list of CONFIGs from all super classes
classes_in_heirarchy = [obj.__class__] classes_in_hierarchy = [obj.__class__]
configs = [] configs = []
while len(classes_in_heirarchy) > 0: while len(classes_in_hierarchy) > 0:
Class = classes_in_heirarchy.pop() Class = classes_in_hierarchy.pop()
classes_in_heirarchy += Class.__bases__ classes_in_hierarchy += Class.__bases__
if hasattr(Class, "CONFIG"): if hasattr(Class, "CONFIG"):
configs.append(Class.CONFIG) configs.append(Class.CONFIG)
#Order matters a lot here, first dicts have higher priority #Order matters a lot here, first dicts have higher priority
all_dicts = [kwargs, filtered_locals(local_args), obj.__dict__] all_dicts = [kwargs, filtered_locals(local_args), obj.__dict__]
all_dicts += configs all_dicts += configs
item_lists = reversed([d.items() for d in all_dicts]) obj.__dict__ = merge_config(all_dicts)
obj.__dict__ = dict(reduce(op.add, item_lists))
def merge_config(all_dicts):
all_config = reduce(op.add, [d.items() for d in all_dicts])
config = dict()
for c in all_config:
key, value = c
if not key in config:
config[key] = value
else:
#When two dictionaries have the same key, they are merged.
if isinstance(value, dict) and isinstance(config[key], dict):
config[key] = merge_config([config[key], value])
return config
def digest_locals(obj): def digest_locals(obj):
caller_locals = inspect.currentframe().f_back.f_locals caller_locals = inspect.currentframe().f_back.f_locals