Issue #28563: Make plural form selection more lenient and accepting

non-integer numbers.  Django tests depend on this.

diff --git a/Lib/gettext.py b/Lib/gettext.py
index 2b7f92f697b9267e60a7b3f7ad2bf65cb2dbf8b4..765cc8c781efd27fba7362cb05c9da8b48bd9dc2 100644 (file)
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -158,6 +158,14 @@ 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__,))
+    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.
@@ -181,11 +189,11 @@ def c2py(plural):
             elif c == ')':
                 depth -= 1
 
-        ns = {}
+        ns = {'_as_int': _as_int}
         exec('''if 1:
             def func(n):
                 if not isinstance(n, int):
-                    raise ValueError('Plural value must be an integer.')
+                    n = _as_int(n)
                 return int(%s)
             ''' % result, ns)
         return ns['func']

diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index 9a8e2acfe242cacab2a82529d80b9460934b5ac8..4d1e0a35e7ade4e4e2f658d502c70aea709d2911 100644 (file)
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -372,12 +372,16 @@ class PluralFormsTestCase(GettextBaseTest):
         self.assertRaises(ZeroDivisionError, f, 0)
 
     def test_plural_number(self):
-        f = gettext.c2py('1')
-        self.assertEqual(f(1), 1)
-        self.assertRaises(ValueError, f, 1.0)
-        self.assertRaises(ValueError, f, '1')
-        self.assertRaises(ValueError, f, [])
-        self.assertRaises(ValueError, f, object())
+        f = gettext.c2py('n != 1')
+        self.assertEqual(f(1), 0)
+        self.assertEqual(f(2), 1)
+        self.assertEqual(f(1.0), 0)
+        self.assertEqual(f(2.0), 1)
+        self.assertEqual(f(1.1), 1)
+        self.assertRaises(TypeError, f, '2')
+        self.assertRaises(TypeError, f, b'2')
+        self.assertRaises(TypeError, f, [])
+        self.assertRaises(TypeError, f, object())
 
 
 class GNUTranslationParsingTest(GettextBaseTest):