temp push

class_based_refactor
Nicholas Hope 2022-08-25 20:34:38 -04:00
parent 7936dd0d10
commit d49e79e410
3 changed files with 14 additions and 11 deletions

View File

@ -10,6 +10,9 @@ def makeCFG(cfg, default=False):
global bindOrAlias
global condDict
global defaultDict
for bind in cfg:
print(bind.key)
return
bindOrAlias = "bind"
if default:

View File

@ -41,9 +41,9 @@ def parseFile(inputFile) -> (dict, dict):
config, defaults = verify.verifyConfig(config)
if 'errors' in config:
for cclass, messages in config['errors'].items():
print(f'Error in {cclass}:')
print(f'Error in {cclass}:', file=stderr)
for msg in messages:
print(f' {msg}')
print(f' {msg}', file=stderr)
return None, None
else:
return config, defaults
@ -62,14 +62,14 @@ def parseConfig(config, defaults):
if defaults is not None:
stringToWrite = tfscript.makeCFG(defaults, default=True)
replaceDict = writing.writeOutput(stringToWrite, 'default', args)
tempsAndReals.update(replaceDict)
# replaceDict = writing.writeOutput(stringToWrite, 'default', args)
# tempsAndReals.update(replaceDict)
for currentClass in config:
classDict = config[currentClass]
stringToWrite = tfscript.makeCFG(classDict)
replaceDict = writing.writeOutput(stringToWrite, currentClass, args)
tempsAndReals.update(replaceDict)
# replaceDict = writing.writeOutput(stringToWrite, currentClass, args)
# tempsAndReals.update(replaceDict)
return tempsAndReals

View File

@ -1,6 +1,6 @@
"""Verify all the things that could go wrong."""
from copy import deepcopy
from tfscript import types
from tfscript import tftypes
def verifyConfig(cfg: dict) -> (dict, dict):
verifiedConfig = {}
@ -14,14 +14,14 @@ def verifyConfig(cfg: dict) -> (dict, dict):
defaultCFG = cfg.pop('default')
errMessages = []
for key, data in defaultCFG.items():
bind = types.bind(key, data)
bind = tftypes.bind(key, data)
if bind.targetType is not None:
bind = bind.targetType(bind.key, bind.fields)
defaults.append(bind)
errMessages.extend(bind.errors)
if len(errList) > 0:
if len(errMessages) > 0:
errors.update({'default': errMessages})
classList = [
@ -55,9 +55,9 @@ def verifyConfig(cfg: dict) -> (dict, dict):
continue
errMessages = []
for key, data in classCFG.items():
bind = types.bind(key, data)
bind = tftypes.bind(key, data)
if binds.targetType is not None:
if bind.targetType is not None:
bind = bind.targetType(bind.key, bind.fields)
classBinds.append(bind)