[Units][Tests] Handle plurality for trivia answers with parentheses

Harmon758 · Jul 20, 2023 · 222d756 · 222d756
1 parent 9a6010e
commit 222d756
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/tests/test_trivia.py b/tests/test_trivia.py
@@ -60,6 +60,10 @@ def test_plurality_with_partial_slash(self):
             check_answer("Junior/Community Colleges", "junior college")
         )
 
+    def test_plurality_with_parentheses(self):
+        self.assertTrue(check_answer("pigs (hogs)", "pig"))
+        self.assertTrue(check_answer("pigs (hogs)", "hog"))
+
     def test_rearranged_list_with_following_word(self):
         self.assertTrue(
             check_answer(

diff --git a/units/trivia.py b/units/trivia.py
@@ -251,6 +251,9 @@ def add_optional_accepted(accepted, optional):
         accepted.add(remove_preceding_words(item))
     if response in accepted:
         return True
+    with contextlib.suppress(pydantic.ValidationError):
+        if inflect_engine.plural(response) in accepted:
+            return True
     # Check XX YY (or ZZ accepted)
     matches = re.search(
         r"(.+?)\s?\((?:or )?(?:a |an |the )?(.+?)(?: accepted)?\)",