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/plugins/service.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/plugins/service.py')
| -rw-r--r-- | ipalib/plugins/service.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index d20f52876..39285dd5d 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -541,7 +541,7 @@ class service_add(LDAPCreate): self.obj.validate_ipakrbauthzdata(entry_attrs) certs = options.get('usercertificate', []) - certs_der = map(x509.normalize_certificate, certs) + certs_der = [x509.normalize_certificate(c) for c in certs] for dercert in certs_der: x509.verify_cert_subject(ldap, hostname, dercert) entry_attrs['usercertificate'] = certs_der @@ -617,7 +617,7 @@ class service_mod(LDAPUpdate): # verify certificates certs = entry_attrs.get('usercertificate') or [] - certs_der = map(x509.normalize_certificate, certs) + certs_der = [x509.normalize_certificate(c) for c in certs] for dercert in certs_der: x509.verify_cert_subject(ldap, hostname, dercert) # revoke removed certificates @@ -627,7 +627,7 @@ class service_mod(LDAPUpdate): except errors.NotFound: self.obj.handle_not_found(*keys) old_certs = entry_attrs_old.get('usercertificate', []) - old_certs_der = map(x509.normalize_certificate, old_certs) + old_certs_der = [x509.normalize_certificate(c) for c in old_certs] removed_certs_der = set(old_certs_der) - set(certs_der) revoke_certs(removed_certs_der, self.log) |