mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-25 03:41:25 -07:00
Fix undefined variables, basestring usage, and some associated python3 issues
This commit is contained in:
parent
9f7b0dfc30
commit
225fa5d092
84 changed files with 652 additions and 963 deletions
|
@ -250,8 +250,12 @@ image:
|
|||
type: dict
|
||||
sample: {}
|
||||
'''
|
||||
import re
|
||||
import os
|
||||
|
||||
from ansible.module_utils.docker_common import *
|
||||
from ansible.module_utils.docker_common import (HAS_DOCKER_PY_2, AnsibleDockerClient,
|
||||
DockerBaseClass)
|
||||
from ansible.module_utils._text import to_native
|
||||
|
||||
try:
|
||||
if HAS_DOCKER_PY_2:
|
||||
|
@ -519,8 +523,7 @@ class ImageManager(DockerBaseClass):
|
|||
params['container_limits'] = self.container_limits
|
||||
if self.buildargs:
|
||||
for key, value in self.buildargs.items():
|
||||
if not isinstance(value, basestring):
|
||||
self.buildargs[key] = str(value)
|
||||
self.buildargs[key] = to_native(value)
|
||||
params['buildargs'] = self.buildargs
|
||||
|
||||
for line in self.client.build(**params):
|
||||
|
@ -604,8 +607,5 @@ def main():
|
|||
client.module.exit_json(**results)
|
||||
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue