Fixes from unit test failures

SuffolkLITLab · Aug 9, 2024 · 5e7d52f · 5e7d52f
1 parent 5790b90
commit 5e7d52f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/docassemble/AssemblyLine/al_general.py b/docassemble/AssemblyLine/al_general.py
@@ -1588,17 +1588,17 @@ def pronoun(self, **kwargs) -> str:
         else:
             default = self.name_full()
 
-        if hasattr(self, "pronouns"):
+        if hasattr(self, "pronouns") and self.pronouns:
             if isinstance(self.pronouns, str):
                 pronouns = DADict(elements={self.pronouns.lower(): True})
             else:
                 pronouns = self.pronouns
 
         if self == this_thread.global_vars.user:
             output = word("you", **kwargs)
-        elif hasattr(self, "pronouns"):
+        elif hasattr(self, "pronouns") and self.pronouns:
+            pronouns_to_use = []
             if isinstance(pronouns, DADict):
-                pronouns_to_use = []
                 for pronoun in pronouns.true_values():
                     if pronoun in [
                         "she/her/hers",
@@ -1696,9 +1696,9 @@ def pronoun_possessive(self, target, **kwargs) -> str:
             "thirdperson" not in kwargs or not kwargs["thirdperson"]
         ):
             output = your(target, **kwargs)
-        elif hasattr(self, "pronouns"):
-            if isinstance(pronouns, DADict):
-                pronouns_to_use = []
+        elif hasattr(self, "pronouns") and self.pronouns:
+            pronouns_to_use = []
+            if isinstance(pronouns, DADict):                
                 for pronoun in pronouns.true_values():
                     if pronoun in [
                         "she/her/hers",
@@ -1773,17 +1773,17 @@ def pronoun_subjective(self, **kwargs) -> str:
         else:
             default = self.name_full()
 
-        if hasattr(self, "pronouns"):
+        if hasattr(self, "pronouns") and self.pronouns:
             if isinstance(self.pronouns, str):
                 pronouns = DADict(elements={self.pronouns.lower(): True})
             else:
                 pronouns = self.pronouns
 
         if self == this_thread.global_vars.user:
             output = word("you", **kwargs)
-        elif hasattr(self, "pronouns"):
+        elif hasattr(self, "pronouns") and self.pronouns:
+            pronouns_to_use = []
             if isinstance(pronouns, DADict):
-                pronouns_to_use = []
                 for pronoun in pronouns.true_values():
                     if pronoun in [
                         "she/her/hers",

diff --git a/docassemble/AssemblyLine/test_al_general.py b/docassemble/AssemblyLine/test_al_general.py
@@ -61,6 +61,8 @@ def setUp(self):
         # Assigning this_thread to self.individual
         self.individual.this_thread = self.this_thread
 
+        self.individual.name.first = "John"
+
     def test_phone_numbers(self):
         self.assertEqual(self.individual.phone_numbers(), "")
         self.individual.phone_number = ""
@@ -423,9 +425,7 @@ def test_custom_pronouns(self):
         self.assertEqual(self.individual.pronoun_possessive("fish"), "xem fish")
 
         self.individual.pronouns_self_described = "Xe/Xir/Xirs/xem/xirself"
-        # Should raise an exception
-        with self.assertRaises(DAAttributeError):
-            self.individual.pronoun_objective()
+        self.assertEqual(self.individual.pronoun_objective(), "John")
 
     def test_name_methods(self):
         self.individual.name.first = "John"