Move AnsibleBaseBaseYAMLObject's position_info into a property

This commit is contained in:
Toshio Kuratomi 2015-04-01 14:54:22 -07:00
commit e697de6076
10 changed files with 54 additions and 136 deletions

View file

@ -146,7 +146,7 @@ class DataLoader():
err_obj = None
if hasattr(yaml_exc, 'problem_mark'):
err_obj = AnsibleBaseYAMLObject()
err_obj.set_position_info(file_name, yaml_exc.problem_mark.line + 1, yaml_exc.problem_mark.column + 1)
err_obj.ansible_pos = (file_name, yaml_exc.problem_mark.line + 1, yaml_exc.problem_mark.column + 1)
raise AnsibleParserError(YAML_SYNTAX_ERROR, obj=err_obj, show_content=show_content)

View file

@ -33,23 +33,20 @@ class AnsibleConstructor(Constructor):
yield data
value = self.construct_mapping(node)
data.update(value)
data._line_number = value._line_number
data._column_number = value._column_number
data._data_source = value._data_source
data.ansible_pos = value.ansible_pos
def construct_mapping(self, node, deep=False):
ret = AnsibleMapping(super(Constructor, self).construct_mapping(node, deep))
ret._line_number = node.__line__
ret._column_number = node.__column__
# in some cases, we may have pre-read the data and then
# passed it to the load() call for YAML, in which case we
# want to override the default datasource (which would be
# '<string>') to the actual filename we read in
if self._ansible_file_name:
ret._data_source = self._ansible_file_name
data_source = self._ansible_file_name
else:
ret._data_source = node.__datasource__
data_source = node.__datasource__
ret.ansible_pos = (data_source, node.__line__, node.__column__)
return ret
@ -58,16 +55,15 @@ class AnsibleConstructor(Constructor):
# to always return unicode objects
value = self.construct_scalar(node)
value = to_unicode(value)
data = AnsibleUnicode(self.construct_scalar(node))
ret = AnsibleUnicode(self.construct_scalar(node))
data._line_number = node.__line__
data._column_number = node.__column__
if self._ansible_file_name:
data._data_source = self._ansible_file_name
data_source = self._ansible_file_name
else:
data._data_source = node.__datasource__
data_source = node.__datasource__
ret.ansible_pos = (data_source, node.__line__, node.__column__)
return data
return ret
AnsibleConstructor.add_constructor(
u'tag:yaml.org,2002:map',

View file

@ -29,22 +29,19 @@ class AnsibleBaseYAMLObject:
_line_number = 0
_column_number = 0
def get_position_info(self):
def _get_ansible_position(self):
return (self._data_source, self._line_number, self._column_number)
def set_position_info(self, src, line, col):
def _set_ansible_position(self, obj):
try:
(src, line, col) = obj
except (TypeError, ValueError):
raise AssertionError('ansible_pos can only be set with a tuple/list of three values: source, line number, column number')
self._data_source = src
self._line_number = line
self._column_number = col
def copy_position_info(self, obj):
''' copies the position info from another object '''
assert isinstance(obj, AnsibleBaseYAMLObject)
(src, line, col) = obj.get_position_info()
self._data_source = src
self._line_number = line
self._column_number = col
ansible_pos = property(_get_ansible_position, _set_ansible_position)
class AnsibleMapping(AnsibleBaseYAMLObject, dict):
''' sub class for dictionaries '''