Merge pull request #188 from paul2048/main

Handle "pair of x" when x in `pl_sb_uninflected_complete`

inflect/__init__.py

@@ -2679,6 +2679,8 @@ def _plnoun(  # noqa: C901
         word = Words(word)
 
         if word.last.lower() in pl_sb_uninflected_complete:
+            if len(word.split_) >= 3:
+                return self._handle_long_compounds(word, count=2) or word
             return word
 
         if word in pl_sb_uninflected_caps:
@@ -2707,13 +2709,9 @@ def _plnoun(  # noqa: C901
                 )
 
         if len(word.split_) >= 3:
-            for numword in range(1, len(word.split_) - 1):
-                if word.split_[numword] in pl_prep_list_da:
-                    return " ".join(
-                        word.split_[: numword - 1]
-                        + [self._plnoun(word.split_[numword - 1], 2)]
-                        + word.split_[numword:]
-                    )
+            handled_words = self._handle_long_compounds(word, count=2)
+            if handled_words is not None:
+                return handled_words
 
         # only pluralize denominators in units
         mo = DENOMINATOR.search(word.lowered)
@@ -2972,6 +2970,30 @@ def _handle_prepositional_phrase(cls, phrase, transform, sep):
             parts[: pivot - 1] + [sep.join([transformed, parts[pivot], ''])]
         ) + " ".join(parts[(pivot + 1) :])
 
+    def _handle_long_compounds(  # noqa: C901
+        self, word: Words, count: int
+    ) -> Union[str, None]:
+        """
+        Handles the plural and singular for compound `Words`s that
+        have three or more words, based on the given count.
+
+        >>> engine()._handle_long_compounds(Words("pair of scissors"), 2)
+        'pairs of scissors'
+        >>> engine()._handle_long_compounds(Words("men beyond hills"), 1)
+        'man beyond hills'
+        """
+        if len(word.split_) < 3:
+            raise ValueError("Connot handle `Words`s shorter than 3 words")
+
+        function = self._sinoun if count == 1 else self._plnoun
+        for numword in range(1, len(word.split_) - 1):
+            if word.split_[numword] in pl_prep_list_da:
+                return " ".join(
+                    word.split_[: numword - 1]
+                    + [function(word.split_[numword - 1], count)]
+                    + word.split_[numword:]
+                )
+
     @staticmethod
     def _find_pivot(words, candidates):
         pivots = (
@@ -3165,6 +3187,8 @@ def _sinoun(  # noqa: C901
         words = Words(word)
 
         if words.last.lower() in pl_sb_uninflected_complete:
+            if len(words.split_) >= 3:
+                return self._handle_long_compounds(words, count=1) or word
             return word
 
         if word in pl_sb_uninflected_caps:

newsfragments/188.feature.rst

@@ -0,0 +1 @@
+Now handle 'pair of x' in pl_sb_uninflected_complete

tests/inflections.txt

@@ -652,6 +652,8 @@
                 scarf  ->  scarves
                schema  ->  schemas|schemata
              scissors  ->  scissors
+     pair of scissors  ->  pairs of scissors
+     pair of slippers  ->  pairs of slippers
              Scotsman  ->  Scotsmen
              sea-bass  ->  sea-bass
                seaman  ->  seamen