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

Use comprehensions rather than map() (#58997)

Browse source 
Since we now require Python > 2.6 on the controller, we can drop the use of map() here
This commit is contained in:
Sam Doran 2019-07-12 15:49:39 -04:00 committed by GitHub
parent dd2755e0b4
commit dd30d86f1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/module_utils/common/text/converters.py
View file

@ -8,8 +8,6 @@ __metaclass__ = type
import datetime
import json
from itertools import repeat
from ansible.module_utils._text import to_bytes, to_native, to_text
from ansible.module_utils.common._collections_compat import Set
from ansible.module_utils.six import (
@ -17,7 +15,6 @@ from ansible.module_utils.six import (
iteritems,
text_type,
)
from ansible.module_utils.six.moves import map
def _json_encode_fallback(obj):
@ -54,11 +51,11 @@ def container_to_bytes(d, encoding='utf-8', errors='surrogate_or_strict'):
if isinstance(d, text_type):
return to_bytes(d, encoding=encoding, errors=errors)
elif isinstance(d, dict):
return dict(map(container_to_bytes, iteritems(d), repeat(encoding), repeat(errors)))
return dict(container_to_bytes(o, encoding, errors) for o in iteritems(d))
elif isinstance(d, list):
return list(map(container_to_bytes, d, repeat(encoding), repeat(errors)))
return [container_to_bytes(o, encoding, errors) for o in d]
elif isinstance(d, tuple):
return tuple(map(container_to_bytes, d, repeat(encoding), repeat(errors)))
return tuple(container_to_bytes(o, encoding, errors) for o in d)
else:
return d
@ -74,10 +71,10 @@ def container_to_text(d, encoding='utf-8', errors='surrogate_or_strict'):
# Warning, can traceback
return to_text(d, encoding=encoding, errors=errors)
elif isinstance(d, dict):
return dict(map(container_to_text, iteritems(d), repeat(encoding), repeat(errors)))
return dict(container_to_text(o, encoding, errors) for o in iteritems(d))
elif isinstance(d, list):
return list(map(container_to_text, d, repeat(encoding), repeat(errors)))
return [container_to_text(o, encoding, errors) for o in d]
elif isinstance(d, tuple):
return tuple(map(container_to_text, d, repeat(encoding), repeat(errors)))
return tuple(container_to_text(o, encoding, errors) for o in d)
else:
return d