diff options
Diffstat (limited to 'lib/python2.7/site-packages/setools/commonquery.py')
| -rwxr-xr-x[-rw-r--r--] | lib/python2.7/site-packages/setools/commonquery.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/python2.7/site-packages/setools/commonquery.py b/lib/python2.7/site-packages/setools/commonquery.py index e105ccb..d447396 100644..100755 --- a/lib/python2.7/site-packages/setools/commonquery.py +++ b/lib/python2.7/site-packages/setools/commonquery.py @@ -19,10 +19,11 @@ import logging import re -from . import compquery, mixins +from .mixins import MatchName, MatchPermission +from .query import PolicyQuery -class CommonQuery(mixins.MatchPermission, compquery.ComponentQuery): +class CommonQuery(MatchPermission, MatchName, PolicyQuery): """ Query common permission sets. @@ -43,12 +44,15 @@ class CommonQuery(mixins.MatchPermission, compquery.ComponentQuery): on the permission names instead of set logic. """ + def __init__(self, policy, **kwargs): + super(CommonQuery, self).__init__(policy, **kwargs) + self.log = logging.getLogger(__name__) + def results(self): """Generator which yields all matching commons.""" - self.log.info("Generating results from {0.policy}".format(self)) - self.log.debug("Name: {0.name!r}, regex: {0.name_regex}".format(self)) - self.log.debug("Perms: {0.perms!r}, regex: {0.perms_regex}, eq: {0.perms_equal}". - format(self)) + self.log.info("Generating common results from {0.policy}".format(self)) + self._match_name_debug(self.log) + self._match_perms_debug(self.log) for com in self.policy.commons(): if not self._match_name(com): |