python · vstinner · Jun 24, 2022 · Jun 28, 2022
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -245,6 +245,11 @@ Changes in the Python API
   to :term:`filesystem encoding and error handler`.
   Argument files should be encoded in UTF-8 instead of ANSI Codepage on Windows.
 
+* :mod:`gettext`: Using non-integer value for selecting a plural form is no
+  longer supported.  It never correctly worked and was deprecated since Python
+  3.7.
+  (Contributed by Victor Stinner in :gh:`94194`.)
+
 
 Build Changes
 =============

diff --git a/Lib/gettext.py b/Lib/gettext.py
@@ -164,26 +164,13 @@ def _parse(tokens, priority=-1):
     return result, nexttok
 
 
-def _as_int(n):
-    try:
-        i = round(n)
-    except TypeError:
-        raise TypeError('Plural value must be an integer, got %s' %
-                        (n.__class__.__name__,)) from None
-    import warnings
-    warnings.warn('Plural value must be an integer, got %s' %
-                  (n.__class__.__name__,),
-                  DeprecationWarning, 4)
-    return n
-
-
 def c2py(plural):
     """Gets a C expression as used in PO files for plural forms and returns a
     Python function that implements an equivalent expression.
     """
-
     if len(plural) > 1000:
         raise ValueError('plural form expression is too long')
+
     try:
         result, nexttok = _parse(_tokenize(plural))
         if nexttok:
@@ -200,13 +187,16 @@ def c2py(plural):
             elif c == ')':
                 depth -= 1
 
-        ns = {'_as_int': _as_int}
-        exec('''if True:
+        ns = {}
+        code = '''if True:
             def func(n):
                 if not isinstance(n, int):
-                    n = _as_int(n)
+                    raise TypeError(f'Plural value must be an integer, '
+                                    f'got {n.__class__.__name__}')
                 return int(%s)
-            ''' % result, ns)
+        '''
+        code = code % result
+        exec(code, ns)
         return ns['func']
     except RecursionError:
         # Recursion error can be raised in _parse() or exec().

diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
@@ -488,12 +488,8 @@ def test_plural_number(self):
         f = gettext.c2py('n != 1')
         self.assertEqual(f(1), 0)
         self.assertEqual(f(2), 1)
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(f(1.0), 0)
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(f(2.0), 1)
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(f(1.1), 1)
+
+        self.assertRaises(TypeError, f, 1.0)
         self.assertRaises(TypeError, f, '2')
         self.assertRaises(TypeError, f, b'2')
         self.assertRaises(TypeError, f, [])

diff --git a/Misc/NEWS.d/next/Library/2022-06-24-09-21-09.gh-issue-94194.GPDO6N.rst b/Misc/NEWS.d/next/Library/2022-06-24-09-21-09.gh-issue-94194.GPDO6N.rst
@@ -0,0 +1,3 @@
+:mod:`gettext`: Using non-integer value for selecting a plural form is no
+longer supported.  It never correctly worked and was deprecated since Python
+3.7. Patch by Victor Stinner.