summaryrefslogtreecommitdiffstats
path: root/ipatests/test_xmlrpc
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2015-08-12 12:25:30 +0200
committerJan Cholasta <jcholast@redhat.com>2015-09-01 11:42:01 +0200
commitace63f4ea55643cb99aaa444d216a6bb9ebb1ed3 (patch)
tree0b5367a1b43369dc0ea20b9e8fde91d44abed1f1 /ipatests/test_xmlrpc
parentfbacc26a6a8b92f4b3570c411b186ab86cbcc1b1 (diff)
downloadfreeipa-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 'ipatests/test_xmlrpc')
-rw-r--r--ipatests/test_xmlrpc/test_add_remove_cert_cmd.py6
-rw-r--r--ipatests/test_xmlrpc/test_vault_plugin.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py b/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py
index c414498a2..e42c1929f 100644
--- a/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py
+++ b/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py
@@ -191,7 +191,7 @@ class CertManipCmdTestBase(XMLRPC_test):
"""
assert_deepequal(
dict(
- usercertificate=map(base64.b64decode, self.certs),
+ usercertificate=[base64.b64decode(c) for c in self.certs],
summary=self.cert_add_summary % self.entity_pkey,
value=self.entity_pkey,
),
@@ -237,8 +237,8 @@ class CertManipCmdTestBase(XMLRPC_test):
"""
assert_deepequal(
dict(
- usercertificate=map(base64.b64decode,
- self.certs_remainder),
+ usercertificate=[base64.b64decode(c)
+ for c in self.certs_remainder],
summary=self.cert_del_summary % self.entity_pkey,
value=self.entity_pkey,
),
diff --git a/ipatests/test_xmlrpc/test_vault_plugin.py b/ipatests/test_xmlrpc/test_vault_plugin.py
index 495512dac..f3b0e0135 100644
--- a/ipatests/test_xmlrpc/test_vault_plugin.py
+++ b/ipatests/test_xmlrpc/test_vault_plugin.py
@@ -34,7 +34,7 @@ symmetric_vault_name = u'symmetric_test_vault'
asymmetric_vault_name = u'asymmetric_test_vault'
# binary data from \x00 to \xff
-secret = ''.join(map(chr, xrange(0, 256)))
+secret = ''.join(chr(c) for c in xrange(0, 256))
password = u'password'
other_password = u'other_password'