sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-18 20:11:20 +00:00
Code Issues Releases Wiki Activity

Moved KIND_MAP checks and definition

Browse Source
This commit is contained in:
Sebastian Goscik 2016-09-20 13:37:29 +01:00
parent 06e95abc78
commit 4a33fa9ffc
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wlauto/core/configuration/configuration.py
View File

@ -25,6 +25,13 @@ from wlauto.utils.types import (identifier, integer, boolean,
obj_dict) obj_dict)
from wlauto.core.configuration.tree import SectionNode from wlauto.core.configuration.tree import SectionNode
# Mapping for kind conversion; see docs for convert_types below
KIND_MAP = {
int: integer,
bool: boolean,
dict: OrderedDict,
}
########################## ##########################
### CONFIG POINT TYPES ### ### CONFIG POINT TYPES ###
########################## ##########################
@ -124,14 +131,6 @@ class LoggingConfig(dict):
raise ValueError(config) raise ValueError(config)
# Mapping for kind conversion; see docs for convert_types below
KIND_MAP = {
int: integer,
bool: boolean,
dict: OrderedDict,
}
def get_type_name(kind): def get_type_name(kind):
typename = str(kind) typename = str(kind)
if '\'' in typename: if '\'' in typename:
@ -207,10 +206,10 @@ class ConfigurationPoint(object):
These are largely for backwards compatibility. These are largely for backwards compatibility.
""" """
self.name = identifier(name) self.name = identifier(name)
if kind is not None and not callable(kind):
raise ValueError('Kind must be callable.')
if kind in KIND_MAP: if kind in KIND_MAP:
kind = KIND_MAP[kind] kind = KIND_MAP[kind]
if kind is not None and not callable(kind):
raise ValueError('Kind must be callable.')
self.kind = kind self.kind = kind
self.mandatory = mandatory self.mandatory = mandatory
self.default = default self.default = default
@ -314,10 +313,10 @@ class RuntimeParameter(object):
self.name = re.compile(name) self.name = re.compile(name)
if kind is not None: if kind is not None:
if not callable(kind):
raise ValueError('Kind must be callable.')
if kind in KIND_MAP: if kind in KIND_MAP:
kind = KIND_MAP[kind] kind = KIND_MAP[kind]
if not callable(kind):
raise ValueError('Kind must be callable.')
else: else:
kind = str kind = str
self.kind = kind self.kind = kind