Fix various dict related pylint warnings

* dict-keys-not-iterating
* dict-values-not-iterating
* dict-items-not-iterating
* dict-iter-method

See: https://pagure.io/freeipa/issue/7758
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes 2018-11-09 11:39:29 +01:00
parent 1e569c4f46
commit c00dd21106
2 changed files with 15 additions and 11 deletions

View File

@ -182,7 +182,8 @@ class TestCIDict:
assert ("Key1", "val1") in items_set
assert ("key2", "val2") in items_set
assert ("KEY3", "VAL3") in items_set
# pylint: disable=dict-iter-method
# pylint: disable=dict-keys-not-iterating, dict-values-not-iterating
assert list(self.cidict.items()) == list(self.cidict.iteritems()) == list(zip(
self.cidict.keys(), self.cidict.values()))
@ -192,8 +193,9 @@ class TestCIDict:
def test_iteritems(self):
items = []
for (k,v) in self.cidict.iteritems():
items.append((k,v))
# pylint: disable=dict-iter-method
for k, v in self.cidict.iteritems():
items.append((k, v))
assert_equal(3, len(items))
items_set = set(items)
assert ("Key1", "val1") in items_set
@ -202,6 +204,7 @@ class TestCIDict:
def test_iterkeys(self):
keys = []
# pylint: disable=dict-iter-method
for k in self.cidict.iterkeys():
keys.append(k)
assert_equal(3, len(keys))
@ -212,6 +215,7 @@ class TestCIDict:
def test_itervalues(self):
values = []
# pylint: disable=dict-iter-method
for k in self.cidict.itervalues():
values.append(k)
assert_equal(3, len(values))
@ -227,7 +231,7 @@ class TestCIDict:
assert "Key1" in keys_set
assert "key2" in keys_set
assert "KEY3" in keys_set
# pylint: disable=dict-iter-method
assert list(self.cidict.keys()) == list(self.cidict.iterkeys())
def test_values(self):
@ -237,7 +241,7 @@ class TestCIDict:
assert "val1" in values_set
assert "val2" in values_set
assert "VAL3" in values_set
# pylint: disable=dict-iter-method
assert list(self.cidict.values()) == list(self.cidict.itervalues())
def test_update(self):

View File

@ -109,7 +109,7 @@ class TestCRUD(XMLRPC_test):
@pytest.mark.parametrize('update', [
dict(u) for l in range(1, len(certmaprule_update_params)+1)
for u in itertools.combinations(
certmaprule_update_params.items(), l)
list(certmaprule_update_params.items()), l)
],
ids=update_idfn,
)
@ -187,7 +187,7 @@ class TestAddRemoveCertmap(XMLRPC_test):
'options', [
dict(o) for l in range(len(certmapdata_create_params)+1)
for o in itertools.combinations(
certmapdata_create_params.items(), l)
list(certmapdata_create_params.items()), l)
],
ids=addcertmap_id,
)
@ -313,10 +313,10 @@ def bindtype_permission(request):
@pytest.fixture(
scope='class',
params=itertools.chain(*[
itertools.combinations(certmaprule_permissions.values(), l)
for l in range(len(certmaprule_permissions.values())+1)
]),
params=itertools.chain(
*[itertools.combinations(list(certmaprule_permissions.values()), l)
for l in range(len(list(certmaprule_permissions.values())) + 1)]
),
ids=permissions_idfn,
)
def certmap_user_permissions(request, bindtype_permission):