Skip to content

Commit

Permalink
Use comprehensions rather than map() (ansible#58997)
Browse files Browse the repository at this point in the history
Since we now require Python > 2.6 on the controller, we can drop the use of map() here
  • Loading branch information
samdoran committed Jul 12, 2019
1 parent dd2755e commit dd30d86
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions lib/ansible/module_utils/common/text/converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@
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 (
binary_type,
iteritems,
text_type,
)
from ansible.module_utils.six.moves import map


def _json_encode_fallback(obj):
Expand Down Expand Up @@ -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

Expand All @@ -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

0 comments on commit dd30d86

Please sign in to comment.