浏览代码

[desktop] Do not compare regexes by address in RedactionRule

Erick Tryzelaar 10 年之前
父节点
当前提交
c7be0bb12b
共有 1 个文件被更改,包括 8 次插入3 次删除
  1. 8 3
      desktop/core/src/desktop/redaction/engine.py

+ 8 - 3
desktop/core/src/desktop/redaction/engine.py

@@ -111,14 +111,19 @@ class RedactionRule(object):
 
   def __repr__(self):
     return 'RedactionRule(%r, %r, %r)' % (
-        self.trigger,
+        self.trigger.pattern if self.trigger else None,
         self.regex.pattern,
         self.replace)
 
   def __eq__(self, other):
+    if not isinstance(other, self.__class__):
+      return False
+
+    self_trigger = self.trigger.pattern if self.trigger else None
+    other_trigger = other.trigger.pattern if other.trigger else None
+
     return \
-        isinstance(other, self.__class__) and \
-        self.trigger == other.trigger and \
+        self_trigger == other_trigger and \
         self.regex.pattern == other.regex.pattern and \
         self.regex.flags == other.regex.flags and \
         self.replace == other.replace