jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/584113 )

Change subject: [cleanup] Simplify plural.py and remove code duplication ......................................................................

[cleanup] Simplify plural.py and remove code duplication

https://codeclimate.com/github/wikimedia/pywikibot/pywikibot/plural.py

Change-Id: I9835f3c5016de667da9c33f65e44109cee49d311 --- M pywikibot/plural.py 1 file changed, 23 insertions(+), 75 deletions(-)

Approvals: Framawiki: Looks good to me, but someone else must approve Dvorapa: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/plural.py b/pywikibot/plural.py index ca71b8d..6c87a8a 100644 --- a/pywikibot/plural.py +++ b/pywikibot/plural.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Module containing plural rules of various languages.""" # -# (C) xqt, 2011-2017 -# (C) Pywikibot team, 2011-2018 +# (C) xqt, 2011-2020 +# (C) Pywikibot team, 2011-2020 # # Distributed under the terms of the MIT license. # @@ -11,9 +11,6 @@

plural_rules = { '_default': {'nplurals': 2, 'plural': lambda n: (n != 1)}, - 'ach': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'ak': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'am': {'nplurals': 2, 'plural': lambda n: (n > 1)}, 'ar': {'nplurals': 6, 'plural': lambda n: 0 if (n == 0) else 1 if (n == 1) else @@ -21,36 +18,15 @@ 3 if (n % 100 >= 3 and n % 100 <= 10) else 4 if (n % 100 >= 11 and n % 100 <= 99) else 5}, - 'arn': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'ay': {'nplurals': 1, 'plural': 0}, - 'be': {'nplurals': 3, 'plural': lambda n: - 0 if (n % 10 == 1 and n % 100 != 11) else - 1 if (n % 10 in range(2, 5) and (n % 100 < 10 or n % 100 >= 20)) - else 2}, - 'bo': {'nplurals': 1, 'plural': 0}, - 'br': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'bs': {'nplurals': 3, 'plural': lambda n: - 0 if (n % 10 == 1 and n % 100 != 11) else - 1 if (n % 10 in range(2, 5) and (n % 100 < 10 or n % 100 >= 20)) - else 2}, - 'cgg': {'nplurals': 1, 'plural': 0}, 'cs': {'nplurals': 3, 'plural': lambda n: 0 if (n == 1) else 1 if (n >= 2 and n <= 4) else 2}, - 'csb': {'nplurals': 3, 'plural': lambda n: - 0 if (n == 1) else - 1 if n % 10 in range(2, 5) and (n % 100 < 10 or n % 100 >= 20) else - 2}, 'cy': {'nplurals': 4, 'plural': lambda n: 0 if (n == 1) else 1 if (n == 2) else 2 if (n != 8 and n != 11) else 3}, - 'dz': {'nplurals': 1, 'plural': 0}, - 'fa': {'nplurals': 1, 'plural': 0}, - 'fil': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'fr': {'nplurals': 2, 'plural': lambda n: (n > 1)}, 'ga': {'nplurals': 5, 'plural': lambda n: 0 if (n == 1) else 1 if (n == 2) else @@ -62,27 +38,12 @@ 1 if (n == 2 or n == 12) else 2 if (n > 2 and n < 20) else 3}, - 'gun': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'hr': {'nplurals': 3, 'plural': lambda n: - 0 if (n % 10 == 1 and n % 100 != 11) else - 1 if (n % 10 in range(2, 5) and (n % 100 < 10 or n % 100 >= 20)) - else 2}, - 'id': {'nplurals': 1, 'plural': 0}, 'is': {'nplurals': 2, 'plural': lambda n: (n % 10 != 1 or n % 100 == 11)}, - 'ja': {'nplurals': 1, 'plural': 0}, - 'jbo': {'nplurals': 1, 'plural': 0}, - 'ka': {'nplurals': 1, 'plural': 0}, - 'kk': {'nplurals': 1, 'plural': 0}, - 'km': {'nplurals': 1, 'plural': 0}, - 'ko': {'nplurals': 1, 'plural': 0}, 'kw': {'nplurals': 4, 'plural': lambda n: 0 if (n == 1) else 1 if (n == 2) else 2 if (n == 3) else 3}, - 'ky': {'nplurals': 1, 'plural': 0}, - 'ln': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'lo': {'nplurals': 1, 'plural': 0}, 'lt': {'nplurals': 3, 'plural': lambda n: 0 if (n % 10 == 1 and n % 100 != 11) else 1 if (n % 10 >= 2 and (n % 100 < 10 or n % 100 >= 20)) else @@ -91,9 +52,6 @@ 0 if (n % 10 == 1 and n % 100 != 11) else 1 if (n != 0) else 2}, - 'mfe': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'mg': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'mi': {'nplurals': 2, 'plural': lambda n: (n > 1)}, 'mk': {'nplurals': 2, 'plural': lambda n: 0 if n == 1 or n % 10 == 1 else 1}, @@ -101,28 +59,19 @@ 0 if (n == 0) else 1 if n == 1 else 2}, - 'ms': {'nplurals': 1, 'plural': 0}, 'mt': {'nplurals': 4, 'plural': lambda n: 0 if (n == 1) else 1 if (n == 0 or (n % 100 > 1 and n % 100 < 11)) else 2 if (n % 100 > 10 and n % 100 < 20) else 3}, - 'my': {'nplurals': 1, 'plural': 0}, - 'oc': {'nplurals': 2, 'plural': lambda n: (n > 1)}, 'pl': {'nplurals': 3, 'plural': lambda n: 0 if (n == 1) else 1 if (n % 10 in range(2, 5) and (n % 100 < 10 or n % 100 >= 20)) else 2}, - 'pt-br': {'nplurals': 2, 'plural': lambda n: (n > 1)}, 'ro': {'nplurals': 3, 'plural': lambda n: 0 if (n == 1) else 1 if (n == 0 or (n % 100 > 0 and n % 100 < 20)) else 2}, - 'ru': {'nplurals': 3, 'plural': lambda n: - 0 if (n % 10 == 1 and n % 100 != 11) else - 1 if (n % 10 in range(2, 5) and (n % 100 < 10 or n % 100 >= 20)) - else 2}, - 'sah': {'nplurals': 1, 'plural': 0}, 'sk': {'nplurals': 3, 'plural': lambda n: 0 if (n == 1) else 1 if (n >= 2 and n <= 4) else @@ -132,26 +81,25 @@ 1 if (n % 100 == 2) else 2 if (n % 100 == 3 or n % 100 == 4) else 3}, - 'sr': {'nplurals': 3, 'plural': lambda n: - 0 if (n % 10 == 1 and n % 100 != 11) else - 1 if (n % 10 in range(2, 5) and (n % 100 < 10 or n % 100 >= 20)) - else 2}, - 'su': {'nplurals': 1, 'plural': 0}, - 'th': {'nplurals': 1, 'plural': 0}, - 'ti': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'tr': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'tt': {'nplurals': 1, 'plural': 0}, - 'ug': {'nplurals': 1, 'plural': 0}, - 'uk': {'nplurals': 3, 'plural': lambda n: - 0 if (n % 10 == 1 and n % 100 != 11) else - 1 if (n % 10 in range(2, 5) and (n % 100 < 10 or n % 100 >= 20)) - else 2}, - 'uz': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'vi': {'nplurals': 1, 'plural': 0}, - 'wa': {'nplurals': 2, 'plural': lambda n: (n > 1)}, - 'wo': {'nplurals': 1, 'plural': 0}, - 'zh': {'nplurals': 1, 'plural': 0}, - 'zh-hans': {'nplurals': 1, 'plural': 0}, - 'zh-hant': {'nplurals': 1, 'plural': 0}, - 'zh-tw': {'nplurals': 1, 'plural': 0}, } + +plural_rules.update( + dict.fromkeys( + ['ay', 'bo', 'cgg', 'dz', 'fa', 'id', 'ja', 'jbo', 'ka', 'kk', 'km', + 'ko', 'ky', 'lo', 'ms', 'my', 'sah', 'su', 'th', 'tt', 'ug', 'vi', + 'wo', 'zh', 'zh-hans', 'zh-hant', 'zh-tw'], + {'nplurals': 1, 'plural': 0})) + +plural_rules.update( + dict.fromkeys( + ['ach', 'ak', 'am', 'arn', 'br', 'fil', 'fr', 'gun', 'ln', 'mfe', 'mg', + 'mi', 'oc', 'pt-br', 'ti', 'tr', 'uz', 'wa'], + {'nplurals': 2, 'plural': lambda n: (n > 1)})) + +plural_rules.update( + dict.fromkeys( + ['be', 'bs', 'csb', 'hr', 'ru', 'sr', 'uk'], + {'nplurals': 3, 'plural': lambda n: + 0 if n % 10 == 1 and n % 100 != 11 else + 1 if n % 10 in range(2, 5) and (n % 100 < 10 or n % 100 >= 20) + else 2}))