changed some variable names
parent
bacc858826
commit
80a1379f49
|
@ -5,9 +5,9 @@ from tfscript import tftypes
|
|||
def verifyConfig(cfg: dict) -> (dict, dict):
|
||||
verifiedConfig = {}
|
||||
|
||||
# Do defaults first
|
||||
errors = {}
|
||||
|
||||
# Do defaults first
|
||||
defaults = []
|
||||
|
||||
classList = [
|
||||
|
@ -23,20 +23,22 @@ def verifyConfig(cfg: dict) -> (dict, dict):
|
|||
'spy'
|
||||
]
|
||||
|
||||
for isclass, cclass in enumerate(classList):
|
||||
for isclass, class_ in enumerate(classList):
|
||||
|
||||
classCFG = None
|
||||
classBinds = []
|
||||
className = cclass
|
||||
className = class_
|
||||
|
||||
if isinstance(cclass, str) and cclass in cfg:
|
||||
classCFG = cfg.pop(cclass)
|
||||
elif isinstance(cclass, tuple):
|
||||
for tupClass in cclass:
|
||||
if isinstance(class_, str) and class_ in cfg:
|
||||
classCFG = cfg.pop(class_)
|
||||
|
||||
elif isinstance(class_, tuple):
|
||||
for tupClass in class_:
|
||||
if tupClass in cfg:
|
||||
classCFG = cfg.pop(tupClass)
|
||||
className = cclass[0]
|
||||
className = class_[0]
|
||||
break
|
||||
|
||||
if classCFG is None:
|
||||
# Invalid class, this gets caught later.
|
||||
# It may be less efficient this way, but
|
||||
|
@ -61,10 +63,10 @@ def verifyConfig(cfg: dict) -> (dict, dict):
|
|||
verifiedConfig.update({className: classBinds})
|
||||
|
||||
# Turn list into only strings by expanding tuples
|
||||
for i, cclass in enumerate(classList):
|
||||
if isinstance(cclass, tuple):
|
||||
classList.insert(i+1, cclass[1])
|
||||
classList.insert(i+1, cclass[0])
|
||||
for i, class_ in enumerate(classList):
|
||||
if isinstance(class_, tuple):
|
||||
classList.insert(i+1, class_[1])
|
||||
classList.insert(i+1, class_[0])
|
||||
classList.pop(i)
|
||||
|
||||
globalErrors = []
|
||||
|
|
Loading…
Reference in New Issue