Fix to merge function

Will absorb gender of 'other' when self has none.

popolo_data/models.py

@@ -142,6 +142,9 @@ def absorb(self,other):
         for n in other.other_names:
             if n["name"] not in our_names:
                 self.other_names.append(n)
+
+        if not self.gender and other.gender:
+            self.gender = other.gender
 
 class Organization(PopoloObject):
 

tests/test_save.py

@@ -57,7 +57,6 @@ def test_merge(self):
         """
         full_attributes = {"id": "person1",
                              "email": "test@madeup.com",
-                             "gender": "male",
                              "honorific_prefix": "Dr",
                              "honorific_suffix": "MBe",
                              "image": "blahblah.jpg",
@@ -79,6 +78,7 @@ def test_merge(self):
                              }
 
         reduced_attributes = {"id": "4435435",
+                             "gender": "male",
                              "name": "Indiana Jones",
                              "other_names": [{"name":"Indiana Walton Jones"}],
                              }
@@ -120,6 +120,8 @@ def test_merge(self):
         assert other_person.id == "person1"
         assert new_person.property == "123 fake street"
         assert other_person.property == "123 fake street"
+        assert new_person.gender == "male"
+        assert other_person.gender == "male"
         assert "Indiana Walton Jones"  in [x["name"] for x in new_person.other_names]
         assert "Indiana Walton Jones" not in [x["name"] for x in original.other_names]