diff options
| author | Jerome Martin <jxm@risingtidesystems.com> | 2011-06-08 09:30:55 +0200 |
|---|---|---|
| committer | Jerome Martin <jxm@risingtidesystems.com> | 2011-06-08 10:45:57 +0200 |
| commit | d4c58d8b4459a7a1ccb6d90991a8e1185548a585 (patch) | |
| tree | faaa98cb047f03ff5a7a9b4f67a388807d00fbdd /configshell | |
| parent | 265343de5002ed77580bfe16eb911f2350ffd8ef (diff) | |
| download | configshell-fb-d4c58d8b4459a7a1ccb6d90991a8e1185548a585.tar.gz | |
Fixed ui_type_* to type name regressions
* Fixed set param value auto completion
* Fixed get/set group usage of param types
* Some variable naming cleanup for consistency
Diffstat (limited to 'configshell')
| -rw-r--r-- | configshell/node.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/configshell/node.py b/configshell/node.py index 437ff13..0f05f42 100644 --- a/configshell/node.py +++ b/configshell/node.py @@ -428,15 +428,15 @@ class ConfigNode(object): @param default: The default value to return. @type default: any @return: The evaluated parameter value. - @rtype: depends on type_helper + @rtype: depends on type @raise ExecutionError: If evaluation fails. ''' - type_helper = self.get_type_method(type) + type_method = self.get_type_method(type) if ui_value is None: return default else: try: - value = type_helper(ui_value) + value = type_method(ui_value) except ValueError, msg: raise ExecutionError(msg) else: @@ -482,8 +482,8 @@ class ConfigNode(object): self._configuration_groups[group].iteritems())): (type, description, writable) = param_def if writable: - type_helper = self.get_type_method(type) - parameter += '=I{' + type_helper() + '}' + type_method = self.get_type_method(type) + parameter += '=I{' + type_method() + '}' underline2 = ''.ljust(len(parameter), '-') parameters += '%s\n%s\n%s\n\n' \ % (parameter, underline2, description) @@ -496,11 +496,11 @@ class ConfigNode(object): for param, value in parameter.iteritems(): if param in self._configuration_groups[group]: type_name = self._configuration_groups[group][param][0] - type_helper = self.get_type_method(type_name) + type_method = self.get_type_method(type_name) writable = self._configuration_groups[group][param][2] if writable: try: - value = type_helper(value) + value = type_method(value) except ValueError, msg: self.log.error("Not setting %s! %s" % (param, msg)) else: @@ -508,7 +508,7 @@ class ConfigNode(object): group_setter(param, value) group_getter = self.get_group_getter(group) value = group_getter(param) - value = type_helper(value, reverse=True) + value = type_method(value, reverse=True) self.con.display( "Parameter %s has been set to '%s'." \ % (param, value)) @@ -548,8 +548,8 @@ class ConfigNode(object): self._configuration_groups[group] if self._configuration_groups[group][param][2]] if current_param in group_params: - type_name = group_params[current_param][0] - type_method = self.get_type_method(type_name) + type = self._configuration_groups[group][current_param][0] + type_method = self.get_type_method(type) type_enum = type_method(enum=True) if type_enum is not None: type_enum = [item for item in type_enum @@ -624,8 +624,8 @@ class ConfigNode(object): group_getter = self.get_group_getter(group) value = group_getter(param) group_params = self._configuration_groups[group] - type_method = group_params[param][0] writable = group_params[param][2] + type_method = self.get_type_method(group_params[param][0]) value = type_method(value, reverse=True) if writable: writable = "" |