summaryrefslogtreecommitdiff
path: root/lib/python2.7/site-packages/setools/diff/difference.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python2.7/site-packages/setools/diff/difference.py')
-rwxr-xr-x[-rw-r--r--]lib/python2.7/site-packages/setools/diff/difference.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/python2.7/site-packages/setools/diff/difference.py b/lib/python2.7/site-packages/setools/diff/difference.py
index 189c67d..f3cde8a 100644..100755
--- a/lib/python2.7/site-packages/setools/diff/difference.py
+++ b/lib/python2.7/site-packages/setools/diff/difference.py
@@ -27,7 +27,7 @@ class Difference(object):
"""Base class for all policy differences."""
def __init__(self, left_policy, right_policy):
- self.log = logging.getLogger(self.__class__.__name__)
+ self.log = logging.getLogger(__name__)
self.left_policy = left_policy
self.right_policy = right_policy
@@ -72,7 +72,7 @@ class Difference(object):
yield Wrapper(expanded_rule)
@staticmethod
- def _set_diff(left, right):
+ def _set_diff(left, right, key=None):
"""
Standard diff of two sets.
@@ -108,8 +108,8 @@ class Difference(object):
# instead of giving wrong results. If there is a better way to,
# ensure the items match up, please let me know how or submit a patch.
matched_items = set()
- left_matched_items = sorted((left_items - removed_items))
- right_matched_items = sorted((right_items - added_items))
+ left_matched_items = sorted((left_items - removed_items), key=key)
+ right_matched_items = sorted((right_items - added_items), key=key)
assert len(left_matched_items) == len(right_matched_items), \
"Matched items assertion failure (this is an SETools bug), {0} != {1}". \
format(len(left_matched_items), len(right_matched_items))