diff options
Diffstat (limited to 'lib/ansible/playbook/role/metadata.py')
| -rw-r--r-- | lib/ansible/playbook/role/metadata.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/ansible/playbook/role/metadata.py b/lib/ansible/playbook/role/metadata.py index a4dbcf7e..e299122e 100644 --- a/lib/ansible/playbook/role/metadata.py +++ b/lib/ansible/playbook/role/metadata.py @@ -22,7 +22,7 @@ __metaclass__ = type import os from ansible.errors import AnsibleParserError, AnsibleError -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.six import string_types from ansible.playbook.attribute import NonInheritableFieldAttribute from ansible.playbook.base import Base @@ -41,7 +41,7 @@ class RoleMetadata(Base, CollectionSearch): allow_duplicates = NonInheritableFieldAttribute(isa='bool', default=False) dependencies = NonInheritableFieldAttribute(isa='list', default=list) - galaxy_info = NonInheritableFieldAttribute(isa='GalaxyInfo') + galaxy_info = NonInheritableFieldAttribute(isa='dict') argument_specs = NonInheritableFieldAttribute(isa='dict', default=dict) def __init__(self, owner=None): @@ -110,15 +110,6 @@ class RoleMetadata(Base, CollectionSearch): except AssertionError as e: raise AnsibleParserError("A malformed list of role dependencies was encountered.", obj=self._ds, orig_exc=e) - def _load_galaxy_info(self, attr, ds): - ''' - This is a helper loading function for the galaxy info entry - in the metadata, which returns a GalaxyInfo object rather than - a simple dictionary. - ''' - - return ds - def serialize(self): return dict( allow_duplicates=self._allow_duplicates, |