RepoMirrors/setools
1
0
Fork 0
mirror of https://github.com/SELinuxProject/setools synced 2025-04-01 14:48:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Python 3: fix more dict .keys() usage.

Browse Source 
Uncovered by 2to3.  Unit tests now pass in Python 3.
This commit is contained in:
Chris PeBenito 2014-10-30 10:02:04 -04:00
parent 51d8e3e421
commit d16207c114
11 changed files with 19 additions and 19 deletions

2
setools/boolquery.py
View File

@ -72,7 +72,7 @@ class BoolQuery(compquery.ComponentQuery):
self.match_default = bool(match)
for k in opts.keys():
for k in list(opts.keys()):
if k == "default":
self.default = bool(opts[k])
else:

2
setools/commonquery.py
View File

@ -87,7 +87,7 @@ class CommonQuery(compquery.ComponentQuery):
self.perms = perms
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.perms_regex = opts[k]
elif k == "equal":

2
setools/compquery.py
View File

@ -39,7 +39,7 @@ class ComponentQuery(query.PolicyQuery):
self.name = str(name)
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.name_regex = opts[k]
else:

6
setools/contextquery.py
View File

@ -92,7 +92,7 @@ class ContextQuery(query.PolicyQuery):
self.user = str(user)
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.user_regex = opts[k]
else:
@ -117,7 +117,7 @@ class ContextQuery(query.PolicyQuery):
self.role = str(role)
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.role_regex = opts[k]
else:
@ -142,7 +142,7 @@ class ContextQuery(query.PolicyQuery):
self.type_ = str(type_)
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.type_regex = opts[k]
else:

4
setools/objclassquery.py
View File

@ -116,7 +116,7 @@ class ObjClassQuery(compquery.ComponentQuery):
self.common = str(common)
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.common_regex = opts[k]
else:
@ -149,7 +149,7 @@ class ObjClassQuery(compquery.ComponentQuery):
self.perms = perms
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.perms_regex = opts[k]
elif k == "equal":

4
setools/query.py
View File

@ -71,7 +71,7 @@ class PolicyQuery(object):
"""
if regex:
return bool(filter(recomp.search, (str(m) for m in obj)))
return bool(list(filter(recomp.search, (str(m) for m in obj))))
else:
return (criteria in obj)
@ -94,7 +94,7 @@ class PolicyQuery(object):
"""
if regex:
return bool(filter(recomp.search, (str(m) for m in obj)))
return bool(list(filter(recomp.search, (str(m) for m in obj))))
else:
return PolicyQuery._match_set(obj, set(criteria), equal)

2
setools/rolequery.py
View File

@ -97,7 +97,7 @@ class RoleQuery(compquery.ComponentQuery):
self.types = types
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.types_regex = opts[k]
elif k == "equal":

8
setools/rulequery.py
View File

@ -100,7 +100,7 @@ class RuleQuery(PolicyQuery):
self.source = source
for k in opts.keys():
for k in list(opts.keys()):
if k == "indirect":
self.source_indirect = opts[k]
elif k == "regex":
@ -132,7 +132,7 @@ class RuleQuery(PolicyQuery):
self.target = target
for k in opts.keys():
for k in list(opts.keys()):
if k == "indirect":
self.target_indirect = opts[k]
elif k == "regex":
@ -168,7 +168,7 @@ class RuleQuery(PolicyQuery):
else:
self.tclass = set(tclass)
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.tclass_regex = opts[k]
else:
@ -195,7 +195,7 @@ class RuleQuery(PolicyQuery):
self.default = default
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.default_regex = opts[k]
else:

2
setools/terulequery.py
View File

@ -164,7 +164,7 @@ class TERuleQuery(rulequery.RuleQuery):
else:
self.perms = set(perms)
for k in opts.keys():
for k in list(opts.keys()):
if k == "equal":
self.perms_equal = opts[k]
else:

4
setools/typequery.py
View File

@ -97,7 +97,7 @@ class TypeQuery(compquery.ComponentQuery):
self.alias = alias
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.alias_regex = opts[k]
else:
@ -129,7 +129,7 @@ class TypeQuery(compquery.ComponentQuery):
self.attrs = attrs
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.attrs_regex = opts[k]
elif k == "equal":

2
setools/userquery.py
View File

@ -92,7 +92,7 @@ class UserQuery(compquery.ComponentQuery):
self.roles = roles
for k in opts.keys():
for k in list(opts.keys()):
if k == "regex":
self.roles_regex = opts[k]
elif k == "equal":