diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-08-12 12:25:30 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-09-01 11:42:01 +0200 |
| commit | ace63f4ea55643cb99aaa444d216a6bb9ebb1ed3 (patch) | |
| tree | 0b5367a1b43369dc0ea20b9e8fde91d44abed1f1 /ipalib/util.py | |
| parent | fbacc26a6a8b92f4b3570c411b186ab86cbcc1b1 (diff) | |
| download | freeipa-ace63f4ea55643cb99aaa444d216a6bb9ebb1ed3.tar.gz freeipa-ace63f4ea55643cb99aaa444d216a6bb9ebb1ed3.tar.xz freeipa-ace63f4ea55643cb99aaa444d216a6bb9ebb1ed3.zip | |
Replace uses of map()
In Python 2, map() returns a list; in Python 3 it returns an iterator.
Replace all uses by list comprehensions, generators, or for loops,
as required.
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipalib/util.py')
| -rw-r--r-- | ipalib/util.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipalib/util.py b/ipalib/util.py index 3cd23c96e..5a761fb0f 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -234,7 +234,8 @@ def validate_domain_name(domain_name, allow_underscore=False, allow_slash=False) domain_name = domain_name.split(".") # apply DNS name validator to every name part - map(lambda label:validate_dns_label(label, allow_underscore, allow_slash), domain_name) + for label in domain_name: + validate_dns_label(label, allow_underscore, allow_slash) def validate_zonemgr(zonemgr): @@ -734,7 +735,8 @@ def validate_idna_domain(value): #user should use normalized names to avoid mistakes labels = re.split(u'[.\uff0e\u3002\uff61]', value, flags=re.UNICODE) try: - map(lambda label: label.encode("ascii"), labels) + for label in labels: + label.encode("ascii") except UnicodeError: # IDNA is_nonnorm = any(encodings.idna.nameprep(x) != x for x in labels) |