Tweaks

svn: r13752

src/Filters/Rules/Person/_Disconnected.py

@@ -48,5 +48,5 @@ class Disconnected(Rule):
                     'to any other person in the database')
 
     def apply(self,db,person):
-        return (len(person.get_parent_family_handle_list())
-                + len(person.get_family_handle_list()) == 0)
+        return not (person.get_parent_family_handle_list()
+                or person.get_family_handle_list())

src/Filters/Rules/_HasAttributeBase.py

@@ -59,8 +59,6 @@ class HasAttributeBase(Rule):
             specified_type.set_from_xml_str(self.list[0])
             name_match = attr.get_type() == specified_type
 
-            value_match = \
-                    attr.get_value().upper().find(self.list[1].upper()) != -1
-            if name_match and value_match:
-                return True
+            if name_match:
+                return attr.get_value().upper().find(self.list[1].upper()) != -1
         return False