diff -r 3cf248d10bed Lib/gettext.py --- a/Lib/gettext.py Mon Nov 14 12:39:05 2016 +0100 +++ b/Lib/gettext.py Mon Nov 14 18:30:26 2016 +0200 @@ -158,6 +158,19 @@ 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 + if i != n: + import warnings + warnings.warn('Plural value must be an integer, ' + 'got %r' % (n,), + DeprecationWarning, 3) + 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 +194,11 @@ def c2py(plural): elif c == ')': depth -= 1 - ns = {} + ns = {'_as_int': _as_int} exec('''if True: 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 -r 3cf248d10bed Lib/test/test_gettext.py --- a/Lib/test/test_gettext.py Mon Nov 14 12:39:05 2016 +0100 +++ b/Lib/test/test_gettext.py Mon Nov 14 18:30:26 2016 +0200 @@ -440,12 +440,17 @@ class PluralFormsTestCase(GettextBaseTes 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) + with self.assertWarns(DeprecationWarning): + 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):