cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make the 'make' module run on python 3

Browse source 
Traceback:

    Traceback (most recent call last):
      File \"/tmp/ansible_d28_6uwl/ansible_module_make.py\", line 153, in <module>
        main()
      File \"/tmp/ansible_d28_6uwl/ansible_module_make.py\", line 119, in main
        rc, out, err = run_command(base_command + ['--question'], module, check_rc=False)
      File \"/tmp/ansible_d28_6uwl/ansible_module_make.py\", line 79, in run_command
        return rc, sanitize_output(out), sanitize_output(err)
      File \"/tmp/ansible_d28_6uwl/ansible_module_make.py\", line 95, in sanitize_output
        return output.rstrip(b(\"\\r\\n\"))
    TypeError: rstrip arg must be None or str

There is also a six.iteritems issue, fixed using six.
This commit is contained in:
Michael Scherer 2016-11-09 14:43:31 +01:00 committed by Matt Clay
parent 583944207d
commit 64c994c641
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/extras/system/make.py
View file

@ -65,6 +65,9 @@ EXAMPLES = '''
# fix this # fix this
RETURN = '''# ''' RETURN = '''# '''
from ansible.module_utils.six import iteritems
from ansible.module_utils.basic import AnsibleModule
def run_command(command, module, check_rc=True): def run_command(command, module, check_rc=True):
""" """
@ -90,9 +93,9 @@ def sanitize_output(output):
:return: sanitized output :return: sanitized output
""" """
if output is None: if output is None:
return b('') return ''
else: else:
return output.rstrip(b("\r\n")) return output.rstrip("\r\n")
def main(): def main():
@ -108,7 +111,7 @@ def main():
make_path = module.get_bin_path('make', True) make_path = module.get_bin_path('make', True)
make_target = module.params['target'] make_target = module.params['target']
if module.params['params'] is not None: if module.params['params'] is not None:
make_parameters = [k + '=' + str(v) for k, v in module.params['params'].iteritems()] make_parameters = [k + '=' + str(v) for k, v in iteritems(module.params['params'])]
else: else:
make_parameters = [] make_parameters = []
@ -147,7 +150,5 @@ def main():
) )
from ansible.module_utils.basic import *
if __name__ == '__main__': if __name__ == '__main__':
main() main()