From 3da0c54f3b8b613e5fb5272c807e6ebb36675135 Mon Sep 17 00:00:00 2001 From: Ernesto Rodriguez Ortiz Date: Mon, 30 Oct 2017 14:06:46 -0400 Subject: [PATCH] Activate flake8, isort and coveralls in the configuration of tox (#105) * Activate flake8, isort and coveralls in the configuration of tox * Update code to respect PEP8 * Fix bug in the lang_IT for python 3 * Update the README to include the new converters. --- README.rst | 13 +- num2words/base.py | 8 +- num2words/compat.py | 10 +- num2words/lang_AR.py | 5 +- num2words/lang_DE.py | 12 +- num2words/lang_DK.py | 6 +- num2words/lang_EN.py | 6 +- num2words/lang_EN_EUR.py | 6 +- num2words/lang_EN_GB.py | 6 +- num2words/lang_EN_IN.py | 1 + num2words/lang_ES.py | 6 +- num2words/lang_ES_CO.py | 5 +- num2words/lang_ES_VE.py | 5 +- num2words/lang_EU.py | 4 +- num2words/lang_FR.py | 8 +- num2words/lang_FR_CH.py | 8 +- num2words/lang_FR_DZ.py | 3 +- num2words/lang_HE.py | 2 +- num2words/lang_ID.py | 9 +- num2words/lang_IT.py | 6 +- num2words/lang_LV.py | 1 + num2words/lang_NL.py | 3 +- num2words/lang_NO.py | 5 +- num2words/lang_PL.py | 13 +- num2words/lang_PT_BR.py | 18 +- num2words/lang_RU.py | 10 +- num2words/lang_SL.py | 3 +- num2words/lang_TR.py | 788 ++++++++++++++++++++++++++------------- num2words/lang_UK.py | 10 +- num2words/lang_VN.py | 11 +- requirements-test.txt | 1 + setup.py | 13 +- tests/test_ar.py | 1 + tests/test_de.py | 28 +- tests/test_en.py | 3 +- tests/test_es.py | 1 + tests/test_es_co.py | 1 + tests/test_es_ve.py | 1 + tests/test_fr.py | 18 +- tests/test_fr_ch.py | 22 +- tests/test_fr_dz.py | 13 +- tests/test_id.py | 31 +- tests/test_it.py | 160 ++++++-- tests/test_nl.py | 25 +- tests/test_pl.py | 76 +++- tests/test_pt_BR.py | 315 ++++++++++++---- tests/test_ru.py | 19 +- tests/test_sl.py | 17 +- tests/test_tr.py | 136 +++++-- tests/test_uk.py | 19 +- tests/test_vn.py | 62 ++- tox.ini | 12 +- 52 files changed, 1393 insertions(+), 572 deletions(-) diff --git a/README.rst b/README.rst index a65d706..57dfa82 100644 --- a/README.rst +++ b/README.rst @@ -4,6 +4,10 @@ num2words - Convert numbers to words in multiple languages .. image:: https://travis-ci.org/savoirfairelinux/num2words.svg?branch=master :target: https://travis-ci.org/savoirfairelinux/num2words +.. image:: https://coveralls.io/repos/github/savoirfairelinux/num2words/badge.svg?branch=master +:target: https://coveralls.io/github/savoirfairelinux/num2words?branch=master + + ``num2words`` is a library that converts numbers like ``42`` to words like ``forty-two``. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like ``forty-second`` @@ -34,15 +38,18 @@ There's only one function to use:: >>> from num2words import num2words >>> num2words(42) forty-two - >>> num2words(42, ordinal=True) + >>> num2words(42, to='cardinal') forty-second >>> num2words(42, lang='fr') quarante-deux Besides the numerical argument, there's two optional arguments. -**ordinal:** A boolean flag indicating to return an ordinal number instead of a -cardinal one. +**to:** The converter to use. Supperted values are +* ``cardinal`` (default) +* ``ordinal`` +* ``year`` +* ``currency`` **lang:** The language in which to convert the number. Supported values are: diff --git a/num2words/base.py b/num2words/base.py index d242f34..caafcef 100644 --- a/num2words/base.py +++ b/num2words/base.py @@ -18,8 +18,8 @@ from __future__ import unicode_literals import math -from .orderedmapping import OrderedMapping from .compat import to_s +from .orderedmapping import OrderedMapping class Num2Word_Base(object): @@ -250,17 +250,17 @@ class Num2Word_Base(object): def test(self, value): try: _card = self.to_cardinal(value) - except: + except Exception: _card = "invalid" try: _ord = self.to_ordinal(value) - except: + except Exception: _ord = "invalid" try: _ordnum = self.to_ordinal_num(value) - except: + except Exception: _ordnum = "invalid" print("For %s, card is %s;\n\tord is %s; and\n\tordnum is %s." diff --git a/num2words/compat.py b/num2words/compat.py index 26ea36c..e03fd81 100644 --- a/num2words/compat.py +++ b/num2words/compat.py @@ -14,13 +14,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -import sys - -PY3 = sys.version_info[0] == 3 - def to_s(val): - if PY3: - return str(val) - else: + try: return unicode(val) + except NameError: + return str(val) diff --git a/num2words/lang_AR.py b/num2words/lang_AR.py index 913180e..d9e5958 100644 --- a/num2words/lang_AR.py +++ b/num2words/lang_AR.py @@ -15,7 +15,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import division, unicode_literals, print_function +from __future__ import division, print_function, unicode_literals + from . import lang_EU @@ -109,7 +110,7 @@ def main(): 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: print(val, "is", n2w.to_currency(val)) print(val, "is", n2w.to_year(val)) diff --git a/num2words/lang_DE.py b/num2words/lang_DE.py index 3d99db2..e019e25 100644 --- a/num2words/lang_DE.py +++ b/num2words/lang_DE.py @@ -15,7 +15,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals + from .lang_EU import Num2Word_EU @@ -55,7 +56,7 @@ class Num2Word_DE(Num2Word_EU): "sexagint", "septuagint", "oktogint", "nonagint"] self.high_numwords = ( ["zent"] + self.gen_high_numwords(units, tens, lows) - ) + ) self.mid_numwords = [(1000, "tausend"), (100, "hundert"), (90, "neunzig"), (80, "achtzig"), (70, "siebzig"), (60, "sechzig"), (50, "f\xFCnfzig"), @@ -141,11 +142,12 @@ to_ordnum = n2w.to_ordinal_num def main(): for val in [1, 7, 8, 12, 17, 81, 91, 99, 100, 101, 102, 155, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000, - 8280, 8291, 150000, 500000, 3000000, 1000000, 2000001, 1000000000, 2000000000, - -21212121211221211111, -2.121212, -1.0000100]: + 8280, 8291, 150000, 500000, 3000000, 1000000, 2000001, + 1000000000, 2000000000, -21212121211221211111, -2.121212, + -1.0000100]: n2w.test(val) - # n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270570) n2w.test(3000000) n2w.test(3000000000001) n2w.test(3000000324566) diff --git a/num2words/lang_DK.py b/num2words/lang_DK.py index 0aed83b..06ba56c 100644 --- a/num2words/lang_DK.py +++ b/num2words/lang_DK.py @@ -14,7 +14,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import division, unicode_literals, print_function +from __future__ import division, print_function, unicode_literals + from . import lang_EU @@ -145,8 +146,7 @@ def main(): 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test( - 1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) for val in [1, 120, 160, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: print(val, "er", n2w.to_currency(val)) print(val, "er", n2w.to_year(val)) diff --git a/num2words/lang_EN.py b/num2words/lang_EN.py index cd718c9..685a9fb 100644 --- a/num2words/lang_EN.py +++ b/num2words/lang_EN.py @@ -14,7 +14,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import division, unicode_literals, print_function +from __future__ import division, print_function, unicode_literals + from . import lang_EU @@ -103,8 +104,7 @@ def main(): 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test( - 1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: print(val, "is", n2w.to_currency(val)) print(val, "is", n2w.to_year(val)) diff --git a/num2words/lang_EN_EUR.py b/num2words/lang_EN_EUR.py index 36bb09e..a2a4943 100644 --- a/num2words/lang_EN_EUR.py +++ b/num2words/lang_EN_EUR.py @@ -14,7 +14,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals + from .lang_EN import Num2Word_EN @@ -38,8 +39,7 @@ def main(): 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test( - 1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: print(val, "is", n2w.to_currency(val)) print(val, "is", n2w.to_year(val)) diff --git a/num2words/lang_EN_GB.py b/num2words/lang_EN_GB.py index 89d8c94..81f0605 100644 --- a/num2words/lang_EN_GB.py +++ b/num2words/lang_EN_GB.py @@ -14,7 +14,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals + from .lang_EN import Num2Word_EN @@ -37,8 +38,7 @@ def main(): 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test( - 1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: print(val, "is", n2w.to_currency(val)) print(val, "is", n2w.to_year(val)) diff --git a/num2words/lang_EN_IN.py b/num2words/lang_EN_IN.py index 26ee90a..88d1057 100644 --- a/num2words/lang_EN_IN.py +++ b/num2words/lang_EN_IN.py @@ -15,6 +15,7 @@ # MA 02110-1301 USA from __future__ import unicode_literals + from .lang_EN import Num2Word_EN diff --git a/num2words/lang_ES.py b/num2words/lang_ES.py index dff726d..c3f6095 100644 --- a/num2words/lang_ES.py +++ b/num2words/lang_ES.py @@ -16,7 +16,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals + from .lang_EU import Num2Word_EU @@ -186,8 +187,7 @@ def main(): -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test( - 1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) print(n2w.to_currency(1222)) print(n2w.to_currency(1222, old=True)) print(n2w.to_year(1222)) diff --git a/num2words/lang_ES_CO.py b/num2words/lang_ES_CO.py index 0f306b6..a7e03bd 100644 --- a/num2words/lang_ES_CO.py +++ b/num2words/lang_ES_CO.py @@ -16,7 +16,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals + from .lang_ES import Num2Word_ES @@ -40,7 +41,7 @@ def main(): -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) print(n2w.to_currency(1222)) print(n2w.to_currency(1222, old=True)) print(n2w.to_year(1222)) diff --git a/num2words/lang_ES_VE.py b/num2words/lang_ES_VE.py index 392d979..10c2217 100644 --- a/num2words/lang_ES_VE.py +++ b/num2words/lang_ES_VE.py @@ -16,7 +16,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals + from .lang_ES import Num2Word_ES @@ -41,7 +42,7 @@ def main(): -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) print(n2w.to_currency(1222)) print(n2w.to_currency(1222, old=True)) print(n2w.to_year(1222)) diff --git a/num2words/lang_EU.py b/num2words/lang_EU.py index e8af139..dc554c3 100644 --- a/num2words/lang_EU.py +++ b/num2words/lang_EU.py @@ -15,6 +15,7 @@ # MA 02110-1301 USA from __future__ import unicode_literals + from .base import Num2Word_Base @@ -32,7 +33,8 @@ class Num2Word_EU(Num2Word_Base): "octo", "novem"] tens = ["dec", "vigint", "trigint", "quadragint", "quinquagint", "sexagint", "septuagint", "octogint", "nonagint"] - self.high_numwords = ["cent"] + self.gen_high_numwords(units, tens, lows) + self.high_numwords = ["cent"] + self.gen_high_numwords(units, tens, + lows) def to_currency(self, val, longval=True, jointxt=""): return self.to_splitnum(val, hightxt="Euro/s", lowtxt="Euro cent/s", diff --git a/num2words/lang_FR.py b/num2words/lang_FR.py index c5d62a1..c478ddd 100644 --- a/num2words/lang_FR.py +++ b/num2words/lang_FR.py @@ -15,7 +15,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals + from .lang_EU import Num2Word_EU @@ -52,7 +53,8 @@ class Num2Word_FR(Num2Word_EU): else: if (not (cnum - 80) % 100 or not cnum % 100) and ctext[-1] == "s": ctext = ctext[:-1] - if cnum < 1000 and nnum != 1000 and ntext[-1] != "s" and not nnum % 100: + if cnum < 1000 and nnum != 1000 and \ + ntext[-1] != "s" and not nnum % 100: ntext += "s" if nnum < cnum < 100: @@ -109,7 +111,7 @@ def main(): n2w.test(val) n2w.test( - 1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + 1325325436067876801768700107601001012212132143210473207540327057320957) print(n2w.to_currency(112121)) print(n2w.to_year(1996)) diff --git a/num2words/lang_FR_CH.py b/num2words/lang_FR_CH.py index 716d89a..363bb7a 100644 --- a/num2words/lang_FR_CH.py +++ b/num2words/lang_FR_CH.py @@ -15,7 +15,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals + from .lang_FR import Num2Word_FR @@ -35,7 +36,8 @@ class Num2Word_FR_CH(Num2Word_FR): if nnum < 1000000: return next - if cnum < 1000 and nnum != 1000 and ntext[-1] != "s" and not nnum % 100: + if cnum < 1000 and nnum != 1000 and\ + ntext[-1] != "s" and not nnum % 100: ntext += "s" if nnum < cnum < 100: @@ -61,7 +63,7 @@ def main(): n2w.test(val) n2w.test( - 1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + 1325325436067876801768700107601001012212132143210473207540327057320950) print(n2w.to_currency(112121)) print(n2w.to_year(1996)) diff --git a/num2words/lang_FR_DZ.py b/num2words/lang_FR_DZ.py index 09c6576..718fac1 100644 --- a/num2words/lang_FR_DZ.py +++ b/num2words/lang_FR_DZ.py @@ -15,6 +15,7 @@ # MA 02110-1301 USA from __future__ import unicode_literals + from .lang_FR import Num2Word_FR @@ -40,7 +41,7 @@ def main(): n2w.test(val) n2w.test( - 1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + 1325325436067876801768700107601001012212132143210473207540327057320950) for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: print(val, "is", n2w.to_currency(val)) print(val, "is", n2w.to_year(val)) diff --git a/num2words/lang_HE.py b/num2words/lang_HE.py index b5b3443..15378a3 100644 --- a/num2words/lang_HE.py +++ b/num2words/lang_HE.py @@ -16,7 +16,7 @@ # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals ZERO = (u'אפס',) diff --git a/num2words/lang_ID.py b/num2words/lang_ID.py index 333b098..85c5f01 100644 --- a/num2words/lang_ID.py +++ b/num2words/lang_ID.py @@ -14,7 +14,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals class Num2Word_ID(): @@ -128,8 +128,9 @@ class Num2Word_ID(): return self.BASE[int(number[1])] else: return ( - self.BASE[int(number[0])] + ['puluh'] + self.BASE[int(number[1])] - ) + self.BASE[int(number[0])] + ['puluh'] + + self.BASE[int(number[1])] + ) def spell_float(self, float_part): # spell the float number @@ -168,7 +169,7 @@ class Num2Word_ID(): def to_cardinal(self, number): if number >= self.max_num: - raise OverflowError(self.errmsg_toobig % (number, self.maxnum)) + raise OverflowError(self.errmsg_toobig % (number, self.max_num)) minus = '' if number < 0: minus = 'min ' diff --git a/num2words/lang_IT.py b/num2words/lang_IT.py index d421b85..e4c9273 100644 --- a/num2words/lang_IT.py +++ b/num2words/lang_IT.py @@ -14,7 +14,6 @@ # MA 02110-1301 USA from __future__ import unicode_literals -from .lang_EU import Num2Word_EU # Globals # ------- @@ -101,9 +100,10 @@ class Num2Word_IT: prefix = self.to_ordinal(int(float_number)) else: prefix = self.to_cardinal(int(float_number)) + float_part = str(float_number).split('.')[1] postfix = " ".join( - # Drops the trailing zero and comma ~~~~ - [self.to_cardinal(int(c)) for c in str(float_number % 1)[2:]] + # Drops the trailing zero and comma + [self.to_cardinal(int(c)) for c in float_part] ) return prefix + Num2Word_IT.FLOAT_INFIX_WORD + postfix diff --git a/num2words/lang_LV.py b/num2words/lang_LV.py index d3979da..18f1878 100644 --- a/num2words/lang_LV.py +++ b/num2words/lang_LV.py @@ -282,6 +282,7 @@ class Num2Word_LV(object): def to_currency(self, n, currency='EUR', cents=True, seperator=','): return to_currency(n, currency, cents, seperator) + if __name__ == '__main__': import doctest doctest.testmod() diff --git a/num2words/lang_NL.py b/num2words/lang_NL.py index ac01641..ccee1b7 100644 --- a/num2words/lang_NL.py +++ b/num2words/lang_NL.py @@ -15,7 +15,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import unicode_literals, print_function +from __future__ import print_function, unicode_literals + from .lang_EU import Num2Word_EU diff --git a/num2words/lang_NO.py b/num2words/lang_NO.py index 53e6026..1d47e96 100644 --- a/num2words/lang_NO.py +++ b/num2words/lang_NO.py @@ -14,7 +14,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA -from __future__ import division, unicode_literals, print_function +from __future__ import division, print_function, unicode_literals + from . import lang_EU @@ -111,7 +112,7 @@ def main(): 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: print(val, "er", n2w.to_currency(val)) print(val, "er", n2w.to_year(val)) diff --git a/num2words/lang_PL.py b/num2words/lang_PL.py index b254976..39cbaa8 100644 --- a/num2words/lang_PL.py +++ b/num2words/lang_PL.py @@ -18,11 +18,11 @@ u""" >>> from textwrap import fill >>> ' '.join([str(i) for i in splitby3('1')]) -u'1' +'1' >>> ' '.join([str(i) for i in splitby3('1123')]) -u'1 123' +'1 123' >>> ' '.join([str(i) for i in splitby3('1234567890')]) -u'1 234 567 890' +'1 234 567 890' >>> print(' '.join([n2w(i) for i in range(10)])) zero jeden dwa trzy cztery pięć sześć siedem osiem dziewięć @@ -194,7 +194,12 @@ def get_digits(n): def pluralize(n, forms): - form = 0 if n == 1 else 1 if (n % 10 > 1 and n % 10 < 5 and (n % 100 < 10 or n % 100 > 20)) else 2 + if n == 1: + form = 0 + elif 5 > n % 10 > 1 and (n % 100 < 10 or n % 100 > 20): + form = 1 + else: + form = 2 return forms[form] diff --git a/num2words/lang_PT_BR.py b/num2words/lang_PT_BR.py index 88a8416..0bb8f1a 100644 --- a/num2words/lang_PT_BR.py +++ b/num2words/lang_PT_BR.py @@ -17,6 +17,7 @@ # MA 02110-1301 USA from __future__ import division, unicode_literals + import re from . import lang_EU @@ -31,13 +32,14 @@ class Num2Word_PT_BR(lang_EU.Num2Word_EU): def setup(self): self.negword = "menos " self.pointword = "vírgula" - self.errmsg_nornum = "Somente números podem ser convertidos para palavras" + self.errmsg_nornum = "Somente números podem ser convertidos para " \ + "palavras" self.exclude_title = ["e", "vírgula", "menos"] self.mid_numwords = [ (1000, "mil"), (100, "cem"), (90, "noventa"), - (80, "oitenta"), (70, "setenta"), (60, "sessenta"), (50, "cinquenta"), - (40, "quarenta"), (30, "trinta") + (80, "oitenta"), (70, "setenta"), (60, "sessenta"), + (50, "cinquenta"), (40, "quarenta"), (30, "trinta") ] self.low_numwords = [ "vinte", "dezenove", "dezoito", "dezessete", "dezesseis", @@ -132,12 +134,15 @@ class Num2Word_PT_BR(lang_EU.Num2Word_EU): def to_cardinal(self, value): result = super(Num2Word_PT_BR, self).to_cardinal(value) - # Transforms "mil E cento e catorze reais" into "mil, cento e catorze reais" + # Transforms "mil E cento e catorze reais" into "mil, cento e catorze + # reais" for ext in ( 'mil', 'milhão', 'milhões', 'bilhão', 'bilhões', 'trilhão', 'trilhões', 'quatrilhão', 'quatrilhões'): if re.match('.*{} e \w*ento'.format(ext), result): - result = result.replace('{} e'.format(ext), '{},'.format(ext), 1) + result = result.replace( + '{} e'.format(ext), '{},'.format(ext), 1 + ) return result @@ -153,7 +158,8 @@ class Num2Word_PT_BR(lang_EU.Num2Word_EU): thousand_separator = self.thousand_separators[idx] if char != '0' and thousand_separator: - # avoiding "segundo milionésimo milésimo" for 6000000, for instance + # avoiding "segundo milionésimo milésimo" for 6000000, + # for instance result.append(thousand_separator) thousand_separator = '' diff --git a/num2words/lang_RU.py b/num2words/lang_RU.py index 1f37bef..080eec5 100644 --- a/num2words/lang_RU.py +++ b/num2words/lang_RU.py @@ -18,11 +18,11 @@ u""" >>> from textwrap import fill >>> ' '.join([str(i) for i in splitby3('1')]) -u'1' +'1' >>> ' '.join([str(i) for i in splitby3('1123')]) -u'1 123' +'1 123' >>> ' '.join([str(i) for i in splitby3('1234567890')]) -u'1 234 567 890' +'1 234 567 890' >>> print(' '.join([n2w(i) for i in range(10)])) ноль один два три четыре пять шесть семь восемь девять @@ -205,10 +205,10 @@ def get_digits(n): def pluralize(n, forms): - if (n % 100 < 10 or n % 100 > 20): + if n % 100 < 10 or n % 100 > 20: if n % 10 == 1: form = 0 - elif (n % 10 > 1 and n % 10 < 5): + elif 5 > n % 10 > 1: form = 1 else: form = 2 diff --git a/num2words/lang_SL.py b/num2words/lang_SL.py index 1b8119c..56c1a23 100644 --- a/num2words/lang_SL.py +++ b/num2words/lang_SL.py @@ -19,6 +19,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals + from .lang_EU import Num2Word_EU @@ -157,7 +158,7 @@ def main(): -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(13253254360678768017687001076010010122121321432104732075403270573) print(n2w.to_currency(112121)) print(n2w.to_year(2000)) diff --git a/num2words/lang_TR.py b/num2words/lang_TR.py index a4983a1..68d364b 100644 --- a/num2words/lang_TR.py +++ b/num2words/lang_TR.py @@ -29,7 +29,8 @@ class Num2Word_TR(object): self.errmsg_nonnum = u"Sadece sayılar yazıya çevrilebilir." self.errmsg_floatord = u"Tam sayı olmayan {} sıralamada kullanılamaz." self.errmsg_negord = u"Pozitif olmayan {} sıralamada kullanılamaz." - self.errmsg_toobig = u"abs({}) sayı yazıya çevirmek için çok büyük. Yazıya çevrilebilecek en büyük rakam {}." + self.errmsg_toobig = u"abs({}) sayı yazıya çevirmek için çok büyük. " \ + u"Yazıya çevrilebilecek en büyük rakam {}." self.exclude_title = [] self.DECIMAL_SIGN = (",",) self.ORDINAL_SIGN = (".",) @@ -116,192 +117,319 @@ class Num2Word_TR(object): def to_cardinal(self, value): wrd = "" is_cardinal = self.verify_cardinal(value) - if is_cardinal: - if not int(value) == value: - return self.to_cardinal_float(value) - self.to_splitnum(value) + if not is_cardinal: + return wrd - if self.order_of_last_zero_digit >= len(self.integers_to_read[0]): - # number like 00 and all 0s and even more, raise error + if not int(value) == value: + return self.to_cardinal_float(value) + self.to_splitnum(value) + + if self.order_of_last_zero_digit >= len(self.integers_to_read[0]): + # number like 00 and all 0s and even more, raise error + return wrd + + if self.total_triplets_to_read == 1: + if self.total_digits_outside_triplets == 2: + if self.order_of_last_zero_digit == 1: + # number like x0, read cardinal x0 and return + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) + return wrd + if self.order_of_last_zero_digit == 0: + # number like xy, read cardinal xy and return + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][1], "" + ) return wrd - if self.total_triplets_to_read == 1: - if self.total_digits_outside_triplets == 2: - if self.order_of_last_zero_digit == 1: - # number like x0, read cardinal x0 and return - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][0], "") - return wrd - if self.order_of_last_zero_digit == 0: - # number like xy, read cardinal xy and return - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][1], "") + if self.total_digits_outside_triplets == 1: + if self.order_of_last_zero_digit == 0: + # number like x, read cardinal x and return + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][0], "" + ) return wrd - if self.total_digits_outside_triplets == 1: - if self.order_of_last_zero_digit == 0: - # number like x, read cardinal x and return - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][0], "") - return wrd + if self.total_digits_outside_triplets == 0: + if self.order_of_last_zero_digit == 2: + # number like x00, read cardinal x00 and return + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_HUNDRED[0] + return wrd + if self.order_of_last_zero_digit == 1: + # number like xy0, read cardinal xy0 and return + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_HUNDRED[0] + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) + return wrd + if self.order_of_last_zero_digit == 0: + # number like xyz, read cardinal xyz and return + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_HUNDRED[0] + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][2], "" + ) + return wrd + if self.total_triplets_to_read >= 2: + if self.total_digits_outside_triplets == 2: + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 1: + # number like x0 and all 0s, read cardinal x0 0..0 + # and return + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] + return wrd + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 2: + # number like xy and all 0s, read cardinal xy 0..0 + # and return + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][1], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] + return wrd + if self.order_of_last_zero_digit < len( + self.integers_to_read[0]) - 2: + # number like xy and others, read cardinal xy n..n + # and return + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][1], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] + + if self.total_digits_outside_triplets == 1: + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 1: + # number like x and all 0s, read cardinal x 0..0 + # and return + if not (self.total_triplets_to_read == 2 and + self.integers_to_read[0][0] == "1"): + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] + return wrd + if self.order_of_last_zero_digit < len( + self.integers_to_read[0]) - 1: + # number like x and others, read cardinal x n..n + # and return + if not (self.total_triplets_to_read == 2 and + self.integers_to_read[0][0] == "1"): + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] + + if self.total_digits_outside_triplets == 0: + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 1: + # number like x00 and all 0s, read cardinal x00 0..0 + # and return + wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + wrd += self.CARDINAL_HUNDRED[0] + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] + return wrd + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 2: + # number like xy0 and all 0s, read cardinal xy0 0..0 + # and return + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_HUNDRED[0] + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] + return wrd + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 3: + # number like xyz and all 0s, read cardinal xyz 0..0 + # and return + wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + wrd += self.CARDINAL_HUNDRED[0] + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][2], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] + return wrd + if self.order_of_last_zero_digit < len( + self.integers_to_read[0]) - 3: + # number like xyz and all others, read cardinal xyz n..n + wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + wrd += self.CARDINAL_HUNDRED[0] + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) + if not (self.total_triplets_to_read == 2 and + self.integers_to_read[0][2] == "1"): + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][2], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] + + for i in list(range(self.total_triplets_to_read - 1, 0, -1)): + reading_triplet_order = self.total_triplets_to_read - i if self.total_digits_outside_triplets == 0: - if self.order_of_last_zero_digit == 2: - # number like x00, read cardinal x00 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_HUNDRED[0] - return wrd - if self.order_of_last_zero_digit == 1: - # number like xy0, read cardinal xy0 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][1], "") - return wrd - if self.order_of_last_zero_digit == 0: - # number like xyz, read cardinal xyz and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][1], "") - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][2], "") - return wrd + last_read_digit_order = reading_triplet_order * 3 + else: + last_read_digit_order = (reading_triplet_order - 1) * 3 +\ + self.total_digits_outside_triplets - if self.total_triplets_to_read >= 2: - if self.total_digits_outside_triplets == 2: - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 1: - # number like x0 and all 0s, read cardinal x0 0..0 and return - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] - return wrd - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 2: - # number like xy and all 0s, read cardinal xy 0..0 and return - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][1], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] - return wrd - if self.order_of_last_zero_digit < len(self.integers_to_read[0]) - 2: - # number like xy and others, read cardinal xy n..n and return - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][1], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] - - if self.total_digits_outside_triplets == 1: - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 1: - # number like x and all 0s, read cardinal x 0..0 and return - if not (self.total_triplets_to_read == 2 and self.integers_to_read[0][0] == "1"): - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] - return wrd - if self.order_of_last_zero_digit < len(self.integers_to_read[0]) - 1: - # number like x and others, read cardinal x n..n and return - if not (self.total_triplets_to_read == 2 and self.integers_to_read[0][0] == "1"): - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] - - if self.total_digits_outside_triplets == 0: - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 1: - # number like x00 and all 0s, read cardinal x00 0..0 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] - return wrd - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 2: - # number like xy0 and all 0s, read cardinal xy0 0..0 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][1], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] - return wrd - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 3: - # number like xyz and all 0s, read cardinal xyz 0..0 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][1], "") - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][2], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] - return wrd - if self.order_of_last_zero_digit < len(self.integers_to_read[0]) - 3: - # number like xyz and all others, read cardinal xyz n..n - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][1], "") - if not (self.total_triplets_to_read == 2 and self.integers_to_read[0][2] == "1"): - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][2], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] - - for i in list(range(self.total_triplets_to_read - 1, 0, -1)): - reading_triplet_order = self.total_triplets_to_read - i - if self.total_digits_outside_triplets == 0: - last_read_digit_order = reading_triplet_order * 3 - else: - last_read_digit_order = (reading_triplet_order - 1) * 3 + self.total_digits_outside_triplets - - if not self.integers_to_read[0][last_read_digit_order: last_read_digit_order + 3] == "000": - if not self.integers_to_read[0][last_read_digit_order] == "0": - wrd += self.HUNDREDS.get(self.integers_to_read[0][last_read_digit_order], "") - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - ( - last_read_digit_order) - 1: - if i == 1: - wrd += self.CARDINAL_HUNDRED[0] - return wrd - elif i > 1: - wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TRIPLETS[i - 1] - return wrd - else: + if not self.integers_to_read[0][ + last_read_digit_order: last_read_digit_order + 3 + ] == "000": + if not self.integers_to_read[0][ + last_read_digit_order + ] == "0": + wrd += self.HUNDREDS.get( + self.integers_to_read[0][last_read_digit_order], "" + ) + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - ( + last_read_digit_order) - 1: + if i == 1: wrd += self.CARDINAL_HUNDRED[0] + return wrd + elif i > 1: + wrd += self.CARDINAL_HUNDRED[0] + wrd += self.CARDINAL_TRIPLETS[i - 1] + return wrd + else: + wrd += self.CARDINAL_HUNDRED[0] - if not self.integers_to_read[0][last_read_digit_order + 1] == "0": - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - ( - last_read_digit_order) - 2: - if i == 1: - wrd += self.CARDINAL_TENS.get( - self.integers_to_read[0][last_read_digit_order + 1], "") - return wrd - elif i > 1: - wrd += self.CARDINAL_TENS.get( - self.integers_to_read[0][last_read_digit_order + 1], "") - wrd += self.CARDINAL_TRIPLETS[i - 1] - return wrd - else: - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][last_read_digit_order + 1], - "") + if not self.integers_to_read[0][ + last_read_digit_order + 1] == "0": + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - ( + last_read_digit_order) - 2: + if i == 1: + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][ + last_read_digit_order + 1], "" + ) + return wrd + elif i > 1: + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][ + last_read_digit_order + 1], "" + ) + wrd += self.CARDINAL_TRIPLETS[i - 1] + return wrd + else: + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][ + last_read_digit_order + 1], "" + ) - if not self.integers_to_read[0][last_read_digit_order + 2] == "0": - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - ( - last_read_digit_order) - 3: - if i == 1: + if not self.integers_to_read[0][ + last_read_digit_order + 2] == "0": + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - ( + last_read_digit_order) - 3: + if i == 1: + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) + return wrd + if i == 2: + if not self.integers_to_read[0][ + last_read_digit_order: + last_read_digit_order + 2 + ] == "00": wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") - return wrd + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) + elif not self.integers_to_read[0][ + last_read_digit_order + 2] == "1": + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) + wrd += self.CARDINAL_TRIPLETS[i - 1] + return wrd + if i > 2: + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) + wrd += self.CARDINAL_TRIPLETS[i - 1] + return wrd + else: + if not self.integers_to_read[0][ + last_read_digit_order: + last_read_digit_order + 2 + ] == "00": + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) + else: if i == 2: if not self.integers_to_read[0][ - last_read_digit_order: last_read_digit_order + 2] == "00": + last_read_digit_order: + last_read_digit_order + 2 + ] == "00": wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") - elif not self.integers_to_read[0][last_read_digit_order + 2] == "1": + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) + elif not self.integers_to_read[0][ + last_read_digit_order + 2 + ] == "1": wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") - wrd += self.CARDINAL_TRIPLETS[i - 1] - return wrd - if i > 2: - wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") - wrd += self.CARDINAL_TRIPLETS[i - 1] - return wrd - else: - if not self.integers_to_read[0][ - last_read_digit_order: last_read_digit_order + 2] == "00": - wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") - else: - if i == 2: - if not self.integers_to_read[0][ - last_read_digit_order: last_read_digit_order + 2] == "00": - wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") - elif not self.integers_to_read[0][last_read_digit_order + 2] == "1": - wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) - wrd += self.CARDINAL_TRIPLETS[i - 1] + wrd += self.CARDINAL_TRIPLETS[i - 1] return wrd @@ -359,116 +487,220 @@ class Num2Word_TR(object): if self.total_digits_outside_triplets == 2: if self.order_of_last_zero_digit == 1: # number like x0, read ordinal x0 and return - wrd += self.ORDINAL_TENS.get(self.integers_to_read[0][0], "") + wrd += self.ORDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) return wrd if self.order_of_last_zero_digit == 0: # number like xy, read ordinal xy and return - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][0], "") - wrd += self.ORDINAL_ONES.get(self.integers_to_read[0][1], "") + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.ORDINAL_ONES.get( + self.integers_to_read[0][1], "" + ) return wrd if self.total_digits_outside_triplets == 1: if self.order_of_last_zero_digit == 0: # number like x, read ordinal x and return - wrd += self.ORDINAL_ONES.get(self.integers_to_read[0][0], "") + wrd += self.ORDINAL_ONES.get( + self.integers_to_read[0][0], "" + ) return wrd if self.total_digits_outside_triplets == 0: if self.order_of_last_zero_digit == 2: # number like x00, read ordinal x00 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) wrd += self.ORDINAL_HUNDRED[0] return wrd if self.order_of_last_zero_digit == 1: # number like xy0, read ordinal xy0 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) wrd += self.CARDINAL_HUNDRED[0] - wrd += self.ORDINAL_TENS.get(self.integers_to_read[0][1], "") + wrd += self.ORDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) return wrd if self.order_of_last_zero_digit == 0: # number like xyz, read ordinal xyz and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][1], "") + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) if not self.integers_to_read[0][2] == "0": - wrd += self.ORDINAL_ONES.get(self.integers_to_read[0][2], "") + wrd += self.ORDINAL_ONES.get( + self.integers_to_read[0][2], "" + ) return wrd if self.total_triplets_to_read >= 2: if self.total_digits_outside_triplets == 2: - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 1: - # number like x0 and all 0s, read ordinal x0 0..0 and return - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][0], "") - wrd += self.ORDINAL_TRIPLETS[self.total_triplets_to_read - 1] + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 1: + # number like x0 and all 0s, read ordinal x0 0..0 + # and return + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.ORDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] return wrd - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 2: - # number like xy and all 0s, read ordinal xy 0..0 and return - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][1], "") - wrd += self.ORDINAL_TRIPLETS[self.total_triplets_to_read - 1] + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 2: + # number like xy and all 0s, read ordinal xy 0..0 + # and return + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][1], "" + ) + wrd += self.ORDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] return wrd - if self.order_of_last_zero_digit < len(self.integers_to_read[0]) - 2: - # number like xy and others, read cardinal xy n..n and return - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][1], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] + if self.order_of_last_zero_digit < len( + self.integers_to_read[0]) - 2: + # number like xy and others, read cardinal xy n..n + # and return + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][1], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] if self.total_digits_outside_triplets == 1: - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 1: - # number like x and all 0s, read ordinal x 0..0 and return - if not (self.total_triplets_to_read == 2 and self.integers_to_read[0][0] == "1"): - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][0], "") - wrd += self.ORDINAL_TRIPLETS[self.total_triplets_to_read - 1] + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 1: + # number like x and all 0s, read ordinal x 0..0 + # and return + if not (self.total_triplets_to_read == 2 and + self.integers_to_read[0][0] == "1"): + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][0], "" + ) + wrd += self.ORDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] return wrd - if self.order_of_last_zero_digit < len(self.integers_to_read[0]) - 1: - # number like x and others, read cardinal x n..n and return - if not (self.total_triplets_to_read == 2 and self.integers_to_read[0][0] == "1"): - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][0], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] + if self.order_of_last_zero_digit < len( + self.integers_to_read[0]) - 1: + # number like x and others, read cardinal x n..n + # and return + if not (self.total_triplets_to_read == 2 and + self.integers_to_read[0][0] == "1"): + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][0], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] if self.total_digits_outside_triplets == 0: - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 1: - # number like x00 and all 0s, read ordinal x00 0..0 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 1: + # number like x00 and all 0s, read ordinal x00 0..0 + # and return + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) wrd += self.CARDINAL_HUNDRED[0] - wrd += self.ORDINAL_TRIPLETS[self.total_triplets_to_read - 1] + wrd += self.ORDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] return wrd - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 2: - # number like xy0 and all 0s, read ordinal xy0 0..0 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 2: + # number like xy0 and all 0s, read ordinal xy0 0..0 + # and return + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][1], "") - wrd += self.ORDINAL_TRIPLETS[self.total_triplets_to_read - 1] + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) + wrd += self.ORDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] return wrd - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - 3: - # number like xyz and all 0s, read ordinal xyz 0..0 and return - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - 3: + # number like xyz and all 0s, read ordinal xyz 0..0 + # and return + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][1], "") - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][2], "") - wrd += self.ORDINAL_TRIPLETS[self.total_triplets_to_read - 1] + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][2], "" + ) + wrd += self.ORDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] return wrd - if self.order_of_last_zero_digit < len(self.integers_to_read[0]) - 3: - # number like xyz and all others, read cardinal xyz n..n - wrd += self.HUNDREDS.get(self.integers_to_read[0][0], "") + if self.order_of_last_zero_digit < len( + self.integers_to_read[0]) - 3: + # number like xyz and all others, read cardinal + # xyz n..n + wrd += self.HUNDREDS.get( + self.integers_to_read[0][0], "" + ) wrd += self.CARDINAL_HUNDRED[0] - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][1], "") - if not (self.total_triplets_to_read == 2 and self.integers_to_read[0][2] == "1"): - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][2], "") - wrd += self.CARDINAL_TRIPLETS[self.total_triplets_to_read - 1] + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][1], "" + ) + if not (self.total_triplets_to_read == 2 and + self.integers_to_read[0][2] == "1"): + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][2], "" + ) + wrd += self.CARDINAL_TRIPLETS[ + self.total_triplets_to_read - 1 + ] for i in list(range(self.total_triplets_to_read - 1, 0, -1)): reading_triplet_order = self.total_triplets_to_read - i if self.total_digits_outside_triplets == 0: last_read_digit_order = reading_triplet_order * 3 else: - last_read_digit_order = (reading_triplet_order - 1) * 3 + self.total_digits_outside_triplets + last_read_digit_order = \ + (reading_triplet_order - 1) * 3 + \ + self.total_digits_outside_triplets - if not self.integers_to_read[0][last_read_digit_order: last_read_digit_order + 3] == "000": - if not self.integers_to_read[0][last_read_digit_order] == "0": - if not self.integers_to_read[0][last_read_digit_order] == "1": - wrd += self.CARDINAL_ONES.get(self.integers_to_read[0][last_read_digit_order], "") - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - ( + if not self.integers_to_read[0][ + last_read_digit_order: last_read_digit_order + 3 + ] == "000": + if not self.integers_to_read[0][ + last_read_digit_order + ] == "0": + if not self.integers_to_read[0][ + last_read_digit_order + ] == "1": + wrd += self.CARDINAL_ONES.get( + self.integers_to_read[0][ + last_read_digit_order + ], "" + ) + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - ( last_read_digit_order) - 1: if i == 1: wrd += self.ORDINAL_HUNDRED[0] @@ -480,57 +712,89 @@ class Num2Word_TR(object): else: wrd += self.CARDINAL_HUNDRED[0] - if not self.integers_to_read[0][last_read_digit_order + 1] == "0": - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - ( + if not self.integers_to_read[0][ + last_read_digit_order + 1 + ] == "0": + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - ( last_read_digit_order) - 2: if i == 1: wrd += self.ORDINAL_TENS.get( - self.integers_to_read[0][last_read_digit_order + 1], "") + self.integers_to_read[0][ + last_read_digit_order + 1], "" + ) return wrd elif i > 1: wrd += self.CARDINAL_TENS.get( - self.integers_to_read[0][last_read_digit_order + 1], "") + self.integers_to_read[0][ + last_read_digit_order + 1], "" + ) wrd += self.ORDINAL_TRIPLETS[i - 1] return wrd else: - wrd += self.CARDINAL_TENS.get(self.integers_to_read[0][last_read_digit_order + 1], - "") + wrd += self.CARDINAL_TENS.get( + self.integers_to_read[0][ + last_read_digit_order + 1], "" + ) - if not self.integers_to_read[0][last_read_digit_order + 2] == "0": - if self.order_of_last_zero_digit == len(self.integers_to_read[0]) - ( + if not self.integers_to_read[0][ + last_read_digit_order + 2 + ] == "0": + if self.order_of_last_zero_digit == len( + self.integers_to_read[0]) - ( last_read_digit_order) - 3: if i == 1: wrd += self.ORDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) return wrd if i == 2: if not self.integers_to_read[0][ - last_read_digit_order: last_read_digit_order + 2] == "00": + last_read_digit_order: + last_read_digit_order + 2] == "00": wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") - elif not self.integers_to_read[0][last_read_digit_order + 2] == "1": + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) + elif not self.integers_to_read[0][ + last_read_digit_order + 2 + ] == "1": wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) wrd += self.ORDINAL_TRIPLETS[i - 1] return wrd if i > 2: wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) wrd += self.ORDINAL_TRIPLETS[i - 1] return wrd else: if not self.integers_to_read[0][ - last_read_digit_order: last_read_digit_order + 2] == "00": + last_read_digit_order: + last_read_digit_order + 2] == "00": wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) else: if not self.integers_to_read[0][ - last_read_digit_order: last_read_digit_order + 2] == "00": + last_read_digit_order: + last_read_digit_order + 2] == "00": wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") - elif not self.integers_to_read[0][last_read_digit_order + 2] == "1": + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) + elif not self.integers_to_read[0][ + last_read_digit_order + 2] == "1": wrd += self.CARDINAL_ONES.get( - self.integers_to_read[0][last_read_digit_order + 2], "") + self.integers_to_read[0][ + last_read_digit_order + 2], "" + ) wrd += self.CARDINAL_TRIPLETS[i - 1] @@ -539,12 +803,19 @@ class Num2Word_TR(object): def to_splitnum(self, val): float_digits = str(int(val * 10 ** self.precision)) if not int(val) == 0: - self.integers_to_read = [str(int(val)), float_digits[len(float_digits) - self.precision:]] + self.integers_to_read = [ + str(int(val)), + float_digits[len(float_digits) - self.precision:] + ] else: - self.integers_to_read = ["0", "0" * (self.precision - len(float_digits)) - + float_digits[len(float_digits) - self.precision:]] + self.integers_to_read = [ + "0", + "0" * (self.precision - len(float_digits)) + + float_digits[len(float_digits) - self.precision:] + ] if len(self.integers_to_read[0]) % 3 > 0: - self.total_triplets_to_read = (len(self.integers_to_read[0]) // 3) + 1 + self.total_triplets_to_read = (len(self.integers_to_read[0]) // 3)\ + + 1 elif len(self.integers_to_read[0]) % 3 == 0: self.total_triplets_to_read = len(self.integers_to_read[0]) // 3 self.total_digits_outside_triplets = len(self.integers_to_read[0]) % 3 @@ -558,9 +829,10 @@ class Num2Word_TR(object): else: found = 1 - def to_currency(self, value, **kwargs): + def to_currency(self, value): valueparts = self.to_cardinal(value).split(self.pointword) if len(valueparts) == 1: return valueparts[0] + self.CURRENCY_UNIT[0] if len(valueparts) == 2: - return self.CURRENCY_UNIT[0].join(valueparts) + self.CURRENCY_SUBUNIT[0] + return self.CURRENCY_UNIT[0].join(valueparts) + \ + self.CURRENCY_SUBUNIT[0] diff --git a/num2words/lang_UK.py b/num2words/lang_UK.py index e05c6eb..2b75bfa 100644 --- a/num2words/lang_UK.py +++ b/num2words/lang_UK.py @@ -18,11 +18,11 @@ u""" >>> from textwrap import fill >>> ' '.join([str(i) for i in splitby3('1')]) -u'1' +'1' >>> ' '.join([str(i) for i in splitby3('1123')]) -u'1 123' +'1 123' >>> ' '.join([str(i) for i in splitby3('1234567890')]) -u'1 234 567 890' +'1 234 567 890' >>> print(' '.join([n2w(i) for i in range(10)])) нуль один два три чотири п'ять шiсть сiмь вiсiм дев'ять @@ -208,10 +208,10 @@ def get_digits(n): def pluralize(n, forms): # form = 0 if n==1 else 1 if (n % 10 > 1 and n % 10 < 5 and (n % 100 < 10 # or n % 100 > 20)) else 2 - if (n % 100 < 10 or n % 100 > 20): + if n % 100 < 10 or n % 100 > 20: if n % 10 == 1: form = 0 - elif (n % 10 > 1 and n % 10 < 5): + elif 5 > n % 10 > 1: form = 1 else: form = 2 diff --git a/num2words/lang_VN.py b/num2words/lang_VN.py index 51b6d88..1833821 100644 --- a/num2words/lang_VN.py +++ b/num2words/lang_VN.py @@ -17,7 +17,6 @@ from __future__ import unicode_literals - to_19 = (u'không', u'một', u'hai', u'ba', u'bốn', u'năm', u'sáu', u'bảy', u'tám', u'chín', u'mười', u'mười một', u'mười hai', u'mười ba', u'mười bốn', u'mười lăm', u'mười sáu', u'mười bảy', @@ -75,12 +74,12 @@ class Num2Word_VN(object): for (didx, dval) in ((v - 1, 1000 ** v) for v in range(len(denom))): if dval > val: mod = 1000 ** didx - l = val // mod - r = val - (l * mod) + lval = val // mod + r = val - (lval * mod) - ret = self._convert_nnn(l) + u' ' + denom[didx] - if r > 0 and r <= 99: - ret = self._convert_nnn(l) + u' ' + denom[didx] + u' lẻ' + ret = self._convert_nnn(lval) + u' ' + denom[didx] + if 99 >= r > 0: + ret = self._convert_nnn(lval) + u' ' + denom[didx] + u' lẻ' if r > 0: ret = ret + ' ' + self.vietnam_number(r) return ret diff --git a/requirements-test.txt b/requirements-test.txt index fd3bd90..9c4ea11 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -3,4 +3,5 @@ flake8-copyright isort pep8<1.6 coverage +coveralls diff --git a/setup.py b/setup.py index cad7d41..deda731 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,10 @@ -from setuptools import setup, find_packages - +from setuptools import find_packages, setup CLASSIFIERS = [ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', - 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', + 'License :: OSI Approved :: GNU Library or Lesser General Public License ' + '(LGPL)', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Topic :: Software Development :: Internationalization', @@ -13,7 +13,8 @@ CLASSIFIERS = [ 'Topic :: Text Processing :: Linguistic', ] -LONG_DESC = open('README.rst', 'rt').read() + '\n\n' + open('CHANGES.rst', 'rt').read() +LONG_DESC = open('README.rst', 'rt').read() + '\n\n' + \ + open('CHANGES.rst', 'rt').read() setup( name='num2words', @@ -25,7 +26,9 @@ setup( author_email='tos@users.sourceforge.net', maintainer='Savoir-faire Linux inc.', maintainer_email='virgil.dupras@savoirfairelinux.com', - keywords=' number word numbers words convert conversion i18n localisation localization internationalisation internationalization', + keywords=' number word numbers words convert conversion i18n ' + 'localisation localization internationalisation ' + 'internationalization', url='https://github.com/savoirfairelinux/num2words', packages=find_packages(exclude=['tests']), test_suite='tests', diff --git a/tests/test_ar.py b/tests/test_ar.py index 6b0f6e7..e499805 100644 --- a/tests/test_ar.py +++ b/tests/test_ar.py @@ -48,6 +48,7 @@ TEST_CASES_ORDINAL = ( (100, 'مئة'), ) + class Num2WordsARTest(TestCase): def test_number(self): diff --git a/tests/test_de.py b/tests/test_de.py index 98e34f2..4865c26 100644 --- a/tests/test_de.py +++ b/tests/test_de.py @@ -20,6 +20,7 @@ from unittest import TestCase from num2words import num2words + class Num2WordsDETest(TestCase): def test_ordinal_less_than_twenty(self): self.assertEqual(num2words(7, ordinal=True, lang='de'), "siebte") @@ -28,14 +29,27 @@ class Num2WordsDETest(TestCase): self.assertEqual(num2words(17, ordinal=True, lang='de'), "siebzehnte") def test_ordinal_more_than_twenty(self): - self.assertEqual(num2words(81, ordinal=True, lang='de'), "einundachtzigste") + self.assertEqual( + num2words(81, ordinal=True, lang='de'), "einundachtzigste" + ) def test_ordinal_at_crucial_number(self): - self.assertEqual(num2words(100, ordinal=True, lang='de'), "hundertste") - self.assertEqual(num2words(1000, ordinal=True, lang='de'), "tausendste") - self.assertEqual(num2words(4000, ordinal=True, lang='de'), "viertausendste") - self.assertEqual(num2words(2000000, ordinal=True, lang='de'), "zwei millionenste") - self.assertEqual(num2words(5000000000, ordinal=True, lang='de'), "fünf milliardenste") + self.assertEqual( + num2words(100, ordinal=True, lang='de'), "hundertste" + ) + self.assertEqual( + num2words(1000, ordinal=True, lang='de'), "tausendste" + ) + self.assertEqual( + num2words(4000, ordinal=True, lang='de'), "viertausendste" + ) + self.assertEqual( + num2words(2000000, ordinal=True, lang='de'), "zwei millionenste" + ) + self.assertEqual( + num2words(5000000000, ordinal=True, lang='de'), + "fünf milliardenste" + ) def test_cardinal_at_some_numbers(self): self.assertEqual(num2words(2000000, lang='de'), "zwei millionen") @@ -48,4 +62,4 @@ class Num2WordsDETest(TestCase): self.assertRaises(TypeError, num2words, -12, ordinal=True, lang='de') def test_ordinal_for_floating_numbers(self): - self.assertRaises(TypeError, num2words, 2.453, ordinal=True, lang='de') \ No newline at end of file + self.assertRaises(TypeError, num2words, 2.453, ordinal=True, lang='de') diff --git a/tests/test_en.py b/tests/test_en.py index 7897e82..ac06d98 100644 --- a/tests/test_en.py +++ b/tests/test_en.py @@ -17,6 +17,7 @@ from unittest import TestCase from num2words import num2words + class Num2WordsENTest(TestCase): def test_and_join_199(self): # ref https://github.com/savoirfairelinux/num2words/issues/8 @@ -27,4 +28,4 @@ class Num2WordsENTest(TestCase): self.assertEqual(num2words(12.50), "twelve point five zero") self.assertEqual(num2words(12.51), "twelve point five one") self.assertEqual(num2words(12.53), "twelve point five three") - self.assertEqual(num2words(12.59), "twelve point five nine") \ No newline at end of file + self.assertEqual(num2words(12.59), "twelve point five nine") diff --git a/tests/test_es.py b/tests/test_es.py index cbfa6ba..ab008f9 100644 --- a/tests/test_es.py +++ b/tests/test_es.py @@ -81,6 +81,7 @@ TEST_CASES_ORDINAL = ( (100, 'centésimo'), ) + class Num2WordsESTest(TestCase): def test_number(self): diff --git a/tests/test_es_co.py b/tests/test_es_co.py index 8fc8892..4482885 100644 --- a/tests/test_es_co.py +++ b/tests/test_es_co.py @@ -17,6 +17,7 @@ from __future__ import unicode_literals from num2words import num2words + from . import test_es diff --git a/tests/test_es_ve.py b/tests/test_es_ve.py index 596ff4d..b36bba2 100644 --- a/tests/test_es_ve.py +++ b/tests/test_es_ve.py @@ -17,6 +17,7 @@ from __future__ import unicode_literals from num2words import num2words + from . import test_es diff --git a/tests/test_fr.py b/tests/test_fr.py index 17d90f1..782fcbb 100644 --- a/tests/test_fr.py +++ b/tests/test_fr.py @@ -20,11 +20,19 @@ from unittest import TestCase from num2words import num2words + class Num2WordsENTest(TestCase): def test_ordinal_special_joins(self): # ref https://github.com/savoirfairelinux/num2words/issues/18 - self.assertEqual(num2words(5, ordinal=True, lang='fr'), "cinquième") - self.assertEqual(num2words(35, ordinal=True, lang='fr'), "trente-cinquième") - self.assertEqual(num2words(9, ordinal=True, lang='fr'), "neuvième") - self.assertEqual(num2words(49, ordinal=True, lang='fr'), "quarante-neuvième") - + self.assertEqual( + num2words(5, ordinal=True, lang='fr'), "cinquième" + ) + self.assertEqual( + num2words(35, ordinal=True, lang='fr'), "trente-cinquième" + ) + self.assertEqual( + num2words(9, ordinal=True, lang='fr'), "neuvième" + ) + self.assertEqual( + num2words(49, ordinal=True, lang='fr'), "quarante-neuvième" + ) diff --git a/tests/test_fr_ch.py b/tests/test_fr_ch.py index 97ba4e5..a784d34 100644 --- a/tests/test_fr_ch.py +++ b/tests/test_fr_ch.py @@ -20,17 +20,27 @@ from unittest import TestCase from num2words import num2words + class Num2WordsENTest(TestCase): def test_ordinal_special_joins(self): - self.assertEqual(num2words(5, ordinal=True, lang='fr_CH'), "cinquième") - self.assertEqual(num2words(6, ordinal=True, lang='fr_CH'), "sixième") - self.assertEqual(num2words(35, ordinal=True, lang='fr_CH'), "trente-cinquième") + self.assertEqual( + num2words(5, ordinal=True, lang='fr_CH'), "cinquième" + ) + self.assertEqual( + num2words(6, ordinal=True, lang='fr_CH'), "sixième" + ) + self.assertEqual( + num2words(35, ordinal=True, lang='fr_CH'), "trente-cinquième" + ) self.assertEqual(num2words(9, ordinal=True, lang='fr_CH'), "neuvième") - self.assertEqual(num2words(49, ordinal=True, lang='fr_CH'), "quarante-neuvième") + self.assertEqual( + num2words(49, ordinal=True, lang='fr_CH'), "quarante-neuvième" + ) self.assertEqual(num2words(71, lang='fr_CH'), "septante et un") self.assertEqual(num2words(81, lang='fr_CH'), "huitante et un") self.assertEqual(num2words(80, lang='fr_CH'), "huitante") self.assertEqual(num2words(880, lang='fr_CH'), "huit cents huitante") - self.assertEqual(num2words(91, ordinal=True, lang='fr_CH'), "nonante et unième") + self.assertEqual( + num2words(91, ordinal=True, lang='fr_CH'), "nonante et unième" + ) self.assertEqual(num2words(53, lang='fr_CH'), "cinquante-trois") - diff --git a/tests/test_fr_dz.py b/tests/test_fr_dz.py index 2463740..0d2fd96 100644 --- a/tests/test_fr_dz.py +++ b/tests/test_fr_dz.py @@ -18,10 +18,17 @@ from __future__ import unicode_literals from unittest import TestCase -from num2words import num2words from num2words.lang_FR_DZ import to_currency + class Num2WordsPLTest(TestCase): def test_currency(self): - self.assertEqual(to_currency(1234.12), "mille deux cent trente-quatre dinards virgule douze centimes") - self.assertEqual(to_currency(45689.89), "quarante-cinq mille six cent quatre-vingt-neuf dinards virgule quatre-vingt-neuf centimes") + self.assertEqual( + to_currency(1234.12), + "mille deux cent trente-quatre dinards virgule douze centimes" + ) + self.assertEqual( + to_currency(45689.89), + "quarante-cinq mille six cent quatre-vingt-neuf dinards virgule " + "quatre-vingt-neuf centimes" + ) diff --git a/tests/test_id.py b/tests/test_id.py index a1716a0..7fc46b6 100644 --- a/tests/test_id.py +++ b/tests/test_id.py @@ -17,31 +17,42 @@ from unittest import TestCase from num2words import num2words + class Num2WordsIDTest(TestCase): def test_cardinal_for_natural_number(self): self.assertEqual(num2words(10, lang='id'), "sepuluh") self.assertEqual(num2words(11, lang='id'), "sebelas") self.assertEqual(num2words(108, lang='id'), "seratus delapan") self.assertEqual(num2words(1075, lang='id'), "seribu tujuh puluh lima") - self.assertEqual(num2words(1087231, lang='id'), "satu juta delapan puluh tujuh ribu dua ratus tiga puluh satu") - self.assertEqual(num2words(1000000408, lang='id'), "satu miliar empat ratus delapan") + self.assertEqual( + num2words(1087231, lang='id'), + "satu juta delapan puluh tujuh ribu dua ratus tiga puluh satu" + ) + self.assertEqual( + num2words(1000000408, lang='id'), + "satu miliar empat ratus delapan" + ) def test_cardinal_for_decimal_number(self): - self.assertEqual(num2words(12.234, lang='id'), "dua belas koma dua tiga empat") - self.assertEqual(num2words(9.076, lang='id'), "sembilan koma nol tujuh enam") + self.assertEqual( + num2words(12.234, lang='id'), "dua belas koma dua tiga empat" + ) + self.assertEqual( + num2words(9.076, lang='id'), "sembilan koma nol tujuh enam" + ) def test_cardinal_for_negative_number(self): - self.assertEqual(num2words(-923, lang='id'), "min sembilan ratus dua puluh tiga") - self.assertEqual(num2words(-0.234, lang='id'), "min nol koma dua tiga empat") + self.assertEqual( + num2words(-923, lang='id'), "min sembilan ratus dua puluh tiga" + ) + self.assertEqual( + num2words(-0.234, lang='id'), "min nol koma dua tiga empat" + ) def test_ordinal_for_natural_number(self): self.assertEqual(num2words(1, ordinal=True, lang='id'), "pertama") self.assertEqual(num2words(10, ordinal=True, lang='id'), "kesepuluh") - #def test_ordinal_numeric_for_natural_number(self): - # self.assertEqual(num2words(1, ordinal=True, lang='id'), "ke-1") - # self.assertEqual(num2words(10, ordinal=True, lang='id'), "ke-10") - def test_ordinal_for_negative_number(self): self.assertRaises(TypeError, num2words, -12, ordinal=True, lang='id') diff --git a/tests/test_it.py b/tests/test_it.py index be03634..a94f63f 100644 --- a/tests/test_it.py +++ b/tests/test_it.py @@ -15,9 +15,12 @@ # MA 02110-1301 USA from __future__ import unicode_literals + from unittest import TestCase + from num2words import num2words + class Num2WordsITTest(TestCase): maxDiff = None @@ -32,14 +35,29 @@ class Num2WordsITTest(TestCase): self.assertEqual("meno " + pos_ord, neg_ord) def test_float_to_cardinal(self): - self.assertTrue("tre virgola uno quattro uno" in num2words(3.1415, lang="it")) - self.assertTrue("meno cinque virgola uno" in num2words(-5.15, lang="it")) - self.assertTrue("meno zero virgola uno" in num2words(-0.15, lang="it")) + self.assertEqual( + num2words(3.1415, lang="it"), "tre virgola uno quattro uno cinque" + ) + self.assertEqual( + num2words(-5.15, lang="it"), "meno cinque virgola uno cinque" + ) + self.assertEqual( + num2words(-0.15, lang="it"), "meno zero virgola uno cinque" + ) def test_float_to_ordinal(self): - self.assertTrue("terzo virgola uno quattro uno" in num2words(3.1415, lang="it", ordinal=True)) - self.assertTrue("meno quinto virgola uno" in num2words(-5.15, lang="it", ordinal=True)) - self.assertTrue("meno zero virgola uno" in num2words(-0.15, lang="it", ordinal=True)) + self.assertEqual( + num2words(3.1415, lang="it", ordinal=True), + "terzo virgola uno quattro uno cinque" + ) + self.assertEqual( + num2words(-5.15, lang="it", ordinal=True), + "meno quinto virgola uno cinque" + ) + self.assertEqual( + num2words(-0.15, lang="it", ordinal=True), + "meno zero virgola uno cinque" + ) def test_0(self): self.assertEqual(num2words(0, lang="it"), "zero") @@ -80,56 +98,130 @@ class Num2WordsITTest(TestCase): self.assertEqual(num2words(1000, lang="it"), "mille") self.assertEqual(num2words(1001, lang="it"), "milleuno") self.assertEqual(num2words(1500, lang="it"), "millecinquecento") - self.assertEqual(num2words(7378, lang="it"), "settemilatrecentosettantotto") + self.assertEqual( + num2words(7378, lang="it"), "settemilatrecentosettantotto" + ) self.assertEqual(num2words(2000, lang="it"), "duemila") self.assertEqual(num2words(2100, lang="it"), "duemilacento") - self.assertEqual(num2words(6870, lang="it"), "seimilaottocentosettanta") + self.assertEqual( + num2words(6870, lang="it"), "seimilaottocentosettanta" + ) self.assertEqual(num2words(10000, lang="it"), "diecimila") - self.assertEqual(num2words(98765, lang="it"), "novantottomilasettecentosessantacinque") + self.assertEqual( + num2words(98765, lang="it"), + "novantottomilasettecentosessantacinque" + ) self.assertEqual(num2words(100000, lang="it"), "centomila") - self.assertEqual(num2words(523456, lang="it"), "cinquecentoventitremilaquattrocentocinquantasei") + self.assertEqual( + num2words(523456, lang="it"), + "cinquecentoventitremilaquattrocentocinquantasei" + ) def test_big(self): self.assertEqual(num2words(1000000, lang="it"), "un milione") self.assertEqual(num2words(1000007, lang="it"), "un milione e sette") - self.assertEqual(num2words(1200000, lang="it"), "un milione e duecentomila") + self.assertEqual( + num2words(1200000, lang="it"), "un milione e duecentomila" + ) self.assertEqual(num2words(3000000, lang="it"), "tre milioni") self.assertEqual(num2words(3000005, lang="it"), "tre milioni e cinque") - self.assertEqual(num2words(3800000, lang="it"), "tre milioni e ottocentomila") + self.assertEqual( + num2words(3800000, lang="it"), "tre milioni e ottocentomila" + ) self.assertEqual(num2words(1000000000, lang="it"), "un miliardo") - self.assertEqual(num2words(1000000017, lang="it"), "un miliardo e diciassette") + self.assertEqual( + num2words(1000000017, lang="it"), "un miliardo e diciassette" + ) self.assertEqual(num2words(2000000000, lang="it"), "due miliardi") - self.assertEqual(num2words(2000001000, lang="it"), "due miliardi e mille") - self.assertEqual(num2words(1234567890, lang="it"), "un miliardo, duecentotrentaquattro milioni e cinquecentosessantasettemilaottocentonovanta") + self.assertEqual( + num2words(2000001000, lang="it"), "due miliardi e mille" + ) + self.assertEqual( + num2words(1234567890, lang="it"), + "un miliardo, duecentotrentaquattro milioni e " + "cinquecentosessantasettemilaottocentonovanta" + ) self.assertEqual(num2words(1000000000000, lang="it"), "un bilione") - self.assertEqual(num2words(123456789012345678901234567890, lang="it"), "centoventitré quadriliardi, quattrocentocinquantasei quadrilioni, settecentottantanove triliardi, dodici trilioni, trecentoquarantacinque biliardi, seicentosettantotto bilioni, novecentouno miliardi, duecentotrentaquattro milioni e cinquecentosessantasettemilaottocentonovanta") + self.assertEqual( + num2words(123456789012345678901234567890, lang="it"), + "centoventitré quadriliardi, quattrocentocinquantasei " + "quadrilioni, settecentottantanove triliardi, dodici trilioni, " + "trecentoquarantacinque biliardi, seicentosettantotto bilioni, " + "novecentouno miliardi, duecentotrentaquattro milioni e " + "cinquecentosessantasettemilaottocentonovanta" + ) def test_nth_1_to_99(self): self.assertEqual(num2words(1, lang="it", ordinal=True), "primo") self.assertEqual(num2words(8, lang="it", ordinal=True), "ottavo") - self.assertEqual(num2words(23, lang="it", ordinal=True), "ventitreesimo") - self.assertEqual(num2words(47, lang="it", ordinal=True), "quarantasettesimo") - self.assertEqual(num2words(99, lang="it", ordinal=True), "novantanovesimo") + self.assertEqual( + num2words(23, lang="it", ordinal=True), "ventitreesimo" + ) + self.assertEqual( + num2words(47, lang="it", ordinal=True), "quarantasettesimo" + ) + self.assertEqual( + num2words(99, lang="it", ordinal=True), "novantanovesimo" + ) def test_nth_100_to_999(self): self.assertEqual(num2words(100, lang="it", ordinal=True), "centesimo") - self.assertEqual(num2words(112, lang="it", ordinal=True), "centododicesimo") - self.assertEqual(num2words(120, lang="it", ordinal=True), "centoventesimo") - self.assertEqual(num2words(316, lang="it", ordinal=True), "trecentosedicesimo") - self.assertEqual(num2words(700, lang="it", ordinal=True), "settecentesimo") - self.assertEqual(num2words(803, lang="it", ordinal=True), "ottocentotreesimo") - self.assertEqual(num2words(923, lang="it", ordinal=True), "novecentoventitreesimo") + self.assertEqual( + num2words(112, lang="it", ordinal=True), "centododicesimo" + ) + self.assertEqual( + num2words(120, lang="it", ordinal=True), "centoventesimo" + ) + self.assertEqual( + num2words(316, lang="it", ordinal=True), "trecentosedicesimo" + ) + self.assertEqual( + num2words(700, lang="it", ordinal=True), "settecentesimo" + ) + self.assertEqual( + num2words(803, lang="it", ordinal=True), "ottocentotreesimo" + ) + self.assertEqual( + num2words(923, lang="it", ordinal=True), "novecentoventitreesimo" + ) def test_nth_1000_to_999999(self): self.assertEqual(num2words(1000, lang="it", ordinal=True), "millesimo") - self.assertEqual(num2words(1001, lang="it", ordinal=True), "milleunesimo") - self.assertEqual(num2words(1003, lang="it", ordinal=True), "milletreesimo") - self.assertEqual(num2words(1200, lang="it", ordinal=True), "milleduecentesimo") - self.assertEqual(num2words(8640, lang="it", ordinal=True), "ottomilaseicentoquarantesimo") - self.assertEqual(num2words(14000, lang="it", ordinal=True), "quattordicimillesimo") - self.assertEqual(num2words(123456, lang="it", ordinal=True), "centoventitremilaquattrocentocinquantaseiesimo") - self.assertEqual(num2words(987654, lang="it", ordinal=True), "novecentottantasettemilaseicentocinquantaquattresimo") + self.assertEqual( + num2words(1001, lang="it", ordinal=True), "milleunesimo" + ) + self.assertEqual( + num2words(1003, lang="it", ordinal=True), "milletreesimo" + ) + self.assertEqual( + num2words(1200, lang="it", ordinal=True), "milleduecentesimo" + ) + self.assertEqual( + num2words(8640, lang="it", ordinal=True), + "ottomilaseicentoquarantesimo" + ) + self.assertEqual( + num2words(14000, lang="it", ordinal=True), "quattordicimillesimo" + ) + self.assertEqual( + num2words(123456, lang="it", ordinal=True), + "centoventitremilaquattrocentocinquantaseiesimo" + ) + self.assertEqual( + num2words(987654, lang="it", ordinal=True), + "novecentottantasettemilaseicentocinquantaquattresimo" + ) def test_nth_big(self): - self.assertEqual(num2words(1000000001, lang="it", ordinal=True), "un miliardo e unesimo") - self.assertEqual(num2words(123456789012345678901234567890, lang="it", ordinal=True), "centoventitré quadriliardi, quattrocentocinquantasei quadrilioni, settecentottantanove triliardi, dodici trilioni, trecentoquarantacinque biliardi, seicentosettantotto bilioni, novecentouno miliardi, duecentotrentaquattro milioni e cinquecentosessantasettemilaottocentonovantesimo") + self.assertEqual( + num2words(1000000001, lang="it", ordinal=True), + "un miliardo e unesimo" + ) + self.assertEqual( + num2words(123456789012345678901234567890, lang="it", ordinal=True), + "centoventitré quadriliardi, quattrocentocinquantasei " + "quadrilioni, settecentottantanove triliardi, dodici trilioni, " + "trecentoquarantacinque biliardi, seicentosettantotto bilioni, " + "novecentouno miliardi, duecentotrentaquattro milioni e " + "cinquecentosessantasettemilaottocentonovantesimo" + ) diff --git a/tests/test_nl.py b/tests/test_nl.py index 70edebc..90f274a 100644 --- a/tests/test_nl.py +++ b/tests/test_nl.py @@ -20,6 +20,7 @@ from unittest import TestCase from num2words import num2words + class Num2WordsNLTest(TestCase): def test_ordinal_less_than_twenty(self): self.assertEqual(num2words(7, ordinal=True, lang='nl'), "zevende") @@ -28,17 +29,27 @@ class Num2WordsNLTest(TestCase): self.assertEqual(num2words(17, ordinal=True, lang='nl'), "zeventiende") def test_ordinal_more_than_twenty(self): - self.assertEqual(num2words(81, ordinal=True, lang='nl'), "eenentachtigste") + self.assertEqual( + num2words(81, ordinal=True, lang='nl'), "eenentachtigste" + ) def test_ordinal_at_crucial_number(self): self.assertEqual(num2words(100, ordinal=True, lang='nl'), "honderdste") - self.assertEqual(num2words(1000, ordinal=True, lang='nl'), "duizendste") - self.assertEqual(num2words(4000, ordinal=True, lang='nl'), "vierduizendste") - self.assertEqual(num2words(2000000, ordinal=True, lang='nl'), "twee miljoenste") - self.assertEqual(num2words(5000000000, ordinal=True, lang='nl'), "vijf miljardste") + self.assertEqual( + num2words(1000, ordinal=True, lang='nl'), "duizendste" + ) + self.assertEqual( + num2words(4000, ordinal=True, lang='nl'), "vierduizendste" + ) + self.assertEqual( + num2words(2000000, ordinal=True, lang='nl'), "twee miljoenste" + ) + self.assertEqual( + num2words(5000000000, ordinal=True, lang='nl'), "vijf miljardste" + ) def test_cardinal_at_some_numbers(self): - self.assertEqual(num2words(82, lang='nl'), u'twee\xebntachtig') + self.assertEqual(num2words(82, lang='nl'), u'twee\xebntachtig') self.assertEqual(num2words(1013, lang='nl'), "duizenddertien") self.assertEqual(num2words(2000000, lang='nl'), "twee miljoen") self.assertEqual(num2words(4000000000, lang='nl'), "vier miljard") @@ -50,4 +61,4 @@ class Num2WordsNLTest(TestCase): self.assertRaises(TypeError, num2words, -12, ordinal=True, lang='nl') def test_ordinal_for_floating_numbers(self): - self.assertRaises(TypeError, num2words, 2.453, ordinal=True, lang='nl') \ No newline at end of file + self.assertRaises(TypeError, num2words, 2.453, ordinal=True, lang='nl') diff --git a/tests/test_pl.py b/tests/test_pl.py index e21a852..da288ef 100644 --- a/tests/test_pl.py +++ b/tests/test_pl.py @@ -21,6 +21,7 @@ from unittest import TestCase from num2words import num2words from num2words.lang_PL import to_currency + class Num2WordsPLTest(TestCase): def test_cardinal(self): self.assertEqual(num2words(100, lang='pl'), "sto") @@ -31,19 +32,70 @@ class Num2WordsPLTest(TestCase): self.assertEqual(num2words(1000, lang='pl'), "tysiąc") self.assertEqual(num2words(1001, lang='pl'), "tysiąc jeden") self.assertEqual(num2words(2012, lang='pl'), "dwa tysiące dwanaście") - self.assertEqual(num2words(12519.85, lang='pl'), "dwanaście tysięcy pięćset dziewiętnaście przecinek osiemdziesiąt pięć") - self.assertEqual(num2words(123.50, lang='pl'), "sto dwadzieścia trzy przecinek pięć") - self.assertEqual(num2words(1234567890, lang='pl'), "miliard dwieście trzydzieści cztery miliony pięćset sześćdziesiąt siedem tysięcy osiemset dziewięćdzisiąt") - self.assertEqual(num2words(215461407892039002157189883901676, lang='pl'), "dwieście piętnaście kwintylionów czterysta sześćdziesiąt jeden kwadryliardów czterysta siedem kwadrylionów osiemset dziewięćdzisiąt dwa tryliardy trzydzieści dziewięć trylionów dwa biliardy sto pięćdziesiąt siedem bilionów sto osiemdziesiąt dziewięć miliardów osiemset osiemdziesiąt trzy miliony dziewęćset jeden tysięcy sześćset siedemdziesiąt sześć") - self.assertEqual(num2words(719094234693663034822824384220291, lang='pl'), "siedemset dziewiętnaście kwintylionów dziewięćdzisiąt cztery kwadryliardy dwieście trzydzieści cztery kwadryliony sześćset dziewięćdzisiąt trzy tryliardy sześćset sześćdziesiąt trzy tryliony trzydzieści cztery biliardy osiemset dwadzieścia dwa biliony osiemset dwadzieścia cztery miliardy trzysta osiemdziesiąt cztery miliony dwieście dwadzieścia tysięcy dwieście dziewięćdzisiąt jeden") + self.assertEqual( + num2words(12519.85, lang='pl'), + "dwanaście tysięcy pięćset dziewiętnaście przecinek " + "osiemdziesiąt pięć" + ) + self.assertEqual( + num2words(123.50, lang='pl'), + "sto dwadzieścia trzy przecinek pięć" + ) + self.assertEqual( + num2words(1234567890, lang='pl'), + "miliard dwieście trzydzieści cztery miliony pięćset " + "sześćdziesiąt siedem tysięcy osiemset dziewięćdzisiąt" + ) + self.assertEqual( + num2words(215461407892039002157189883901676, lang='pl'), + "dwieście piętnaście kwintylionów czterysta sześćdziesiąt jeden " + "kwadryliardów czterysta siedem kwadrylionów osiemset " + "dziewięćdzisiąt dwa tryliardy trzydzieści dziewięć trylionów " + "dwa biliardy sto pięćdziesiąt siedem bilionów sto osiemdziesiąt " + "dziewięć miliardów osiemset osiemdziesiąt trzy miliony " + "dziewęćset jeden tysięcy sześćset siedemdziesiąt sześć" + ) + self.assertEqual( + num2words(719094234693663034822824384220291, lang='pl'), + "siedemset dziewiętnaście kwintylionów dziewięćdzisiąt cztery " + "kwadryliardy dwieście trzydzieści cztery kwadryliony sześćset " + "dziewięćdzisiąt trzy tryliardy sześćset sześćdziesiąt trzy " + "tryliony trzydzieści cztery biliardy osiemset dwadzieścia dwa " + "biliony osiemset dwadzieścia cztery miliardy trzysta " + "osiemdziesiąt cztery miliony dwieście dwadzieścia " + "tysięcy dwieście dziewięćdzisiąt jeden" + ) def test_currency(self): self.assertEqual(to_currency(1.0, 'EUR'), "jeden euro, zero centów") self.assertEqual(to_currency(1.0, 'PLN'), "jeden złoty, zero groszy") - self.assertEqual(to_currency(1234.56, 'EUR'), "tysiąc dwieście trzydzieści cztery euro, pięćdziesiąt sześć centów") - self.assertEqual(to_currency(1234.56, 'PLN'), "tysiąc dwieście trzydzieści cztery złote, pięćdziesiąt sześć groszy") - self.assertEqual(to_currency(10111, 'EUR', seperator=' i'), "sto jeden euro i jedenaście centów") - self.assertEqual(to_currency(10121, 'PLN', seperator=' i'), "sto jeden złotych i dwadzieścia jeden groszy") - self.assertEqual(to_currency(-1251985, cents = False), "minus dwanaście tysięcy pięćset dziewiętnaście euro, 85 centów") - self.assertEqual(to_currency(123.50, 'PLN', seperator=' i'), "sto dwadzieścia trzy złote i pięćdziesiąt groszy") - self.assertEqual(to_currency(1950, cents = False), "dziewiętnaście euro, 50 centów") + self.assertEqual( + to_currency(1234.56, 'EUR'), + "tysiąc dwieście trzydzieści cztery euro, pięćdziesiąt sześć " + "centów" + ) + self.assertEqual( + to_currency(1234.56, 'PLN'), + "tysiąc dwieście trzydzieści cztery złote, pięćdziesiąt sześć " + "groszy" + ) + self.assertEqual( + to_currency(10111, 'EUR', seperator=' i'), + "sto jeden euro i jedenaście centów" + ) + self.assertEqual( + to_currency(10121, 'PLN', seperator=' i'), + "sto jeden złotych i dwadzieścia jeden groszy" + ) + self.assertEqual( + to_currency(-1251985, cents=False), + "minus dwanaście tysięcy pięćset dziewiętnaście euro, 85 centów" + ) + self.assertEqual( + to_currency(123.50, 'PLN', seperator=' i'), + "sto dwadzieścia trzy złote i pięćdziesiąt groszy" + ) + self.assertEqual( + to_currency(1950, cents=False), + "dziewiętnaście euro, 50 centów" + ) diff --git a/tests/test_pt_BR.py b/tests/test_pt_BR.py index a681d91..653f1c7 100644 --- a/tests/test_pt_BR.py +++ b/tests/test_pt_BR.py @@ -63,36 +63,82 @@ class Num2WordsPTBRTest(TestCase): self.assertEqual(num2words(1000, lang='pt_BR'), 'mil') self.assertEqual(num2words(1001, lang='pt_BR'), 'mil e um') self.assertEqual(num2words(1111, lang='pt_BR'), 'mil, cento e onze') - self.assertEqual(num2words(2114, lang='pt_BR'), 'dois mil, cento e catorze') - self.assertEqual(num2words(73421, lang='pt_BR'), 'setenta e três mil, quatrocentos e vinte e um') + self.assertEqual( + num2words(2114, lang='pt_BR'), 'dois mil, cento e catorze' + ) + self.assertEqual( + num2words(73421, lang='pt_BR'), + 'setenta e três mil, quatrocentos e vinte e um' + ) self.assertEqual(num2words(100000, lang='pt_BR'), 'cem mil') - self.assertEqual(num2words(250050, lang='pt_BR'), 'duzentos e cinquenta mil e cinquenta') - self.assertEqual(num2words(6000000, lang='pt_BR'), 'seis milhões') - self.assertEqual(num2words(19000000000, lang='pt_BR'), 'dezenove bilhões') - self.assertEqual(num2words(145000000002, lang='pt_BR'), 'cento e quarenta e cinco bilhões e dois') + self.assertEqual( + num2words(250050, lang='pt_BR'), + 'duzentos e cinquenta mil e cinquenta' + ) + self.assertEqual( + num2words(6000000, lang='pt_BR'), 'seis milhões' + ) + self.assertEqual( + num2words(19000000000, lang='pt_BR'), 'dezenove bilhões' + ) + self.assertEqual( + num2words(145000000002, lang='pt_BR'), + 'cento e quarenta e cinco bilhões e dois' + ) def test_cardinal_integer_negative(self): self.assertEqual(num2words(-1, lang='pt_BR'), 'menos um') - self.assertEqual(num2words(-256, lang='pt_BR'), 'menos duzentos e cinquenta e seis') + self.assertEqual( + num2words(-256, lang='pt_BR'), 'menos duzentos e cinquenta e seis' + ) self.assertEqual(num2words(-1000, lang='pt_BR'), 'menos mil') self.assertEqual(num2words(-1000000, lang='pt_BR'), 'menos um milhão') - self.assertEqual(num2words(-1234567, lang='pt_BR'), 'menos um milhão, duzentos e trinta e quatro mil, quinhentos e sessenta e sete') + self.assertEqual( + num2words(-1234567, lang='pt_BR'), + 'menos um milhão, duzentos e trinta e quatro mil, quinhentos e ' + 'sessenta e sete' + ) def test_cardinal_float(self): self.assertEqual(num2words(Decimal('1.00'), lang='pt_BR'), 'um') - self.assertEqual(num2words(Decimal('1.01'), lang='pt_BR'), 'um vírgula zero um') - self.assertEqual(num2words(Decimal('1.035'), lang='pt_BR'), 'um vírgula zero três') - self.assertEqual(num2words(Decimal('1.35'), lang='pt_BR'), 'um vírgula três cinco') - self.assertEqual(num2words(Decimal('3.14159'), lang='pt_BR'), 'três vírgula um quatro') - self.assertEqual(num2words(Decimal('101.22'), lang='pt_BR'), 'cento e um vírgula dois dois') - self.assertEqual(num2words(Decimal('2345.75'), lang='pt_BR'), 'dois mil, trezentos e quarenta e cinco vírgula sete cinco') + self.assertEqual(num2words( + Decimal('1.01'), lang='pt_BR'), 'um vírgula zero um') + self.assertEqual(num2words( + Decimal('1.035'), lang='pt_BR'), 'um vírgula zero três' + ) + self.assertEqual(num2words( + Decimal('1.35'), lang='pt_BR'), 'um vírgula três cinco' + ) + self.assertEqual( + num2words(Decimal('3.14159'), lang='pt_BR'), + 'três vírgula um quatro' + ) + self.assertEqual( + num2words(Decimal('101.22'), lang='pt_BR'), + 'cento e um vírgula dois dois' + ) + self.assertEqual( + num2words(Decimal('2345.75'), lang='pt_BR'), + 'dois mil, trezentos e quarenta e cinco vírgula sete cinco') def test_cardinal_float_negative(self): - self.assertEqual(num2words(Decimal('-2.34'), lang='pt_BR'), 'menos dois vírgula três quatro') - self.assertEqual(num2words(Decimal('-9.99'), lang='pt_BR'), 'menos nove vírgula nove nove') - self.assertEqual(num2words(Decimal('-7.01'), lang='pt_BR'), 'menos sete vírgula zero um') - self.assertEqual(num2words(Decimal('-222.22'), lang='pt_BR'), 'menos duzentos e vinte e dois vírgula dois dois') + self.assertEqual( + num2words(Decimal('-2.34'), lang='pt_BR'), + 'menos dois vírgula três quatro' + ) + self.assertEqual( + num2words(Decimal('-9.99'), lang='pt_BR'), + 'menos nove vírgula nove nove' + ) + self.assertEqual( + num2words(Decimal('-7.01'), lang='pt_BR'), + 'menos sete vírgula zero um' + ) + self.assertEqual( + num2words(Decimal('-222.22'), lang='pt_BR'), + 'menos duzentos e vinte e dois vírgula dois dois' + ) def test_ordinal(self): self.assertEqual(num2words(1, lang='pt_BR', ordinal=True), 'primeiro') @@ -105,38 +151,103 @@ class Num2WordsPTBRTest(TestCase): self.assertEqual(num2words(8, lang='pt_BR', ordinal=True), 'oitavo') self.assertEqual(num2words(9, lang='pt_BR', ordinal=True), 'nono') self.assertEqual(num2words(10, lang='pt_BR', ordinal=True), 'décimo') - self.assertEqual(num2words(11, lang='pt_BR', ordinal=True), 'décimo primeiro') - self.assertEqual(num2words(12, lang='pt_BR', ordinal=True), 'décimo segundo') - self.assertEqual(num2words(13, lang='pt_BR', ordinal=True), 'décimo terceiro') - self.assertEqual(num2words(14, lang='pt_BR', ordinal=True), 'décimo quarto') - self.assertEqual(num2words(15, lang='pt_BR', ordinal=True), 'décimo quinto') - self.assertEqual(num2words(16, lang='pt_BR', ordinal=True), 'décimo sexto') - self.assertEqual(num2words(17, lang='pt_BR', ordinal=True), 'décimo sétimo') - self.assertEqual(num2words(18, lang='pt_BR', ordinal=True), 'décimo oitavo') - self.assertEqual(num2words(19, lang='pt_BR', ordinal=True), 'décimo nono') - self.assertEqual(num2words(20, lang='pt_BR', ordinal=True), 'vigésimo') + self.assertEqual( + num2words(11, lang='pt_BR', ordinal=True), 'décimo primeiro' + ) + self.assertEqual( + num2words(12, lang='pt_BR', ordinal=True), 'décimo segundo' + ) + self.assertEqual( + num2words(13, lang='pt_BR', ordinal=True), 'décimo terceiro' + ) + self.assertEqual( + num2words(14, lang='pt_BR', ordinal=True), 'décimo quarto' + ) + self.assertEqual( + num2words(15, lang='pt_BR', ordinal=True), 'décimo quinto' + ) + self.assertEqual( + num2words(16, lang='pt_BR', ordinal=True), 'décimo sexto' + ) + self.assertEqual( + num2words(17, lang='pt_BR', ordinal=True), 'décimo sétimo' + ) + self.assertEqual( + num2words(18, lang='pt_BR', ordinal=True), 'décimo oitavo' + ) + self.assertEqual( + num2words(19, lang='pt_BR', ordinal=True), 'décimo nono' + ) + self.assertEqual( + num2words(20, lang='pt_BR', ordinal=True), 'vigésimo' + ) - self.assertEqual(num2words(21, lang='pt_BR', ordinal=True), 'vigésimo primeiro') - self.assertEqual(num2words(22, lang='pt_BR', ordinal=True), 'vigésimo segundo') - self.assertEqual(num2words(35, lang='pt_BR', ordinal=True), 'trigésimo quinto') - self.assertEqual(num2words(99, lang='pt_BR', ordinal=True), 'nonagésimo nono') + self.assertEqual( + num2words(21, lang='pt_BR', ordinal=True), 'vigésimo primeiro' + ) + self.assertEqual( + num2words(22, lang='pt_BR', ordinal=True), 'vigésimo segundo' + ) + self.assertEqual( + num2words(35, lang='pt_BR', ordinal=True), 'trigésimo quinto' + ) + self.assertEqual( + num2words(99, lang='pt_BR', ordinal=True), 'nonagésimo nono' + ) - self.assertEqual(num2words(100, lang='pt_BR', ordinal=True), 'centésimo') - self.assertEqual(num2words(101, lang='pt_BR', ordinal=True), 'centésimo primeiro') - self.assertEqual(num2words(128, lang='pt_BR', ordinal=True), 'centésimo vigésimo oitavo') - self.assertEqual(num2words(713, lang='pt_BR', ordinal=True), 'septigentésimo décimo terceiro') + self.assertEqual( + num2words(100, lang='pt_BR', ordinal=True), 'centésimo' + ) + self.assertEqual( + num2words(101, lang='pt_BR', ordinal=True), 'centésimo primeiro' + ) + self.assertEqual( + num2words(128, lang='pt_BR', ordinal=True), + 'centésimo vigésimo oitavo' + ) + self.assertEqual( + num2words(713, lang='pt_BR', ordinal=True), + 'septigentésimo décimo terceiro' + ) - self.assertEqual(num2words(1000, lang='pt_BR', ordinal=True), 'milésimo') - self.assertEqual(num2words(1001, lang='pt_BR', ordinal=True), 'milésimo primeiro') - self.assertEqual(num2words(1111, lang='pt_BR', ordinal=True), 'milésimo centésimo décimo primeiro') - self.assertEqual(num2words(2114, lang='pt_BR', ordinal=True), 'segundo milésimo centésimo décimo quarto') - self.assertEqual(num2words(73421, lang='pt_BR', ordinal=True), 'septuagésimo terceiro milésimo quadrigentésimo vigésimo primeiro') + self.assertEqual( + num2words(1000, lang='pt_BR', ordinal=True), 'milésimo' + ) + self.assertEqual( + num2words(1001, lang='pt_BR', ordinal=True), 'milésimo primeiro' + ) + self.assertEqual( + num2words(1111, lang='pt_BR', ordinal=True), + 'milésimo centésimo décimo primeiro' + ) + self.assertEqual( + num2words(2114, lang='pt_BR', ordinal=True), + 'segundo milésimo centésimo décimo quarto' + ) + self.assertEqual( + num2words(73421, lang='pt_BR', ordinal=True), + 'septuagésimo terceiro milésimo quadrigentésimo vigésimo primeiro' + ) - self.assertEqual(num2words(100000, lang='pt_BR', ordinal=True), 'centésimo milésimo') - self.assertEqual(num2words(250050, lang='pt_BR', ordinal=True), 'ducentésimo quinquagésimo milésimo quinquagésimo') - self.assertEqual(num2words(6000000, lang='pt_BR', ordinal=True), 'sexto milionésimo') - self.assertEqual(num2words(19000000000, lang='pt_BR', ordinal=True), 'décimo nono bilionésimo') - self.assertEqual(num2words(145000000002, lang='pt_BR', ordinal=True), 'centésimo quadragésimo quinto bilionésimo segundo') + self.assertEqual( + num2words(100000, lang='pt_BR', ordinal=True), + 'centésimo milésimo' + ) + self.assertEqual( + num2words(250050, lang='pt_BR', ordinal=True), + 'ducentésimo quinquagésimo milésimo quinquagésimo' + ) + self.assertEqual( + num2words(6000000, lang='pt_BR', ordinal=True), 'sexto milionésimo' + ) + self.assertEqual( + num2words(19000000000, lang='pt_BR', ordinal=True), + 'décimo nono bilionésimo' + ) + self.assertEqual( + num2words(145000000002, lang='pt_BR', ordinal=True), + 'centésimo quadragésimo quinto bilionésimo segundo' + ) def test_currency_integer(self): self.assertEqual(self.n2w.to_currency(1), 'um real') @@ -167,53 +278,117 @@ class Num2WordsPTBRTest(TestCase): self.assertEqual(self.n2w.to_currency(100), 'cem reais') self.assertEqual(self.n2w.to_currency(101), 'cento e um reais') - self.assertEqual(self.n2w.to_currency(128), 'cento e vinte e oito reais') + self.assertEqual( + self.n2w.to_currency(128), 'cento e vinte e oito reais' + ) self.assertEqual(self.n2w.to_currency(713), 'setecentos e treze reais') self.assertEqual(self.n2w.to_currency(1000), 'mil reais') self.assertEqual(self.n2w.to_currency(1001), 'mil e um reais') self.assertEqual(self.n2w.to_currency(1111), 'mil, cento e onze reais') - self.assertEqual(self.n2w.to_currency(2114), 'dois mil, cento e catorze reais') - self.assertEqual(self.n2w.to_currency(73421), 'setenta e três mil, quatrocentos e vinte e um reais') + self.assertEqual( + self.n2w.to_currency(2114), 'dois mil, cento e catorze reais' + ) + self.assertEqual( + self.n2w.to_currency(73421), + 'setenta e três mil, quatrocentos e vinte e um reais' + ) self.assertEqual(self.n2w.to_currency(100000), 'cem mil reais') - self.assertEqual(self.n2w.to_currency(250050), 'duzentos e cinquenta mil e cinquenta reais') - self.assertEqual(self.n2w.to_currency(6000000), 'seis milhões de reais') - self.assertEqual(self.n2w.to_currency(19000000000), 'dezenove bilhões de reais') - self.assertEqual(self.n2w.to_currency(145000000002), 'cento e quarenta e cinco bilhões e dois reais') + self.assertEqual( + self.n2w.to_currency(250050), + 'duzentos e cinquenta mil e cinquenta reais' + ) + self.assertEqual( + self.n2w.to_currency(6000000), 'seis milhões de reais' + ) + self.assertEqual( + self.n2w.to_currency(19000000000), 'dezenove bilhões de reais' + ) + self.assertEqual( + self.n2w.to_currency(145000000002), + 'cento e quarenta e cinco bilhões e dois reais' + ) def test_currency_integer_negative(self): self.assertEqual(self.n2w.to_currency(-1), 'menos um real') - self.assertEqual(self.n2w.to_currency(-256), 'menos duzentos e cinquenta e seis reais') + self.assertEqual( + self.n2w.to_currency(-256), + 'menos duzentos e cinquenta e seis reais' + ) self.assertEqual(self.n2w.to_currency(-1000), 'menos mil reais') - self.assertEqual(self.n2w.to_currency(-1000000), 'menos um milhão de reais') - self.assertEqual(self.n2w.to_currency(-1234567), 'menos um milhão, duzentos e trinta e quatro mil, quinhentos e sessenta e sete reais') + self.assertEqual( + self.n2w.to_currency(-1000000), 'menos um milhão de reais' + ) + self.assertEqual( + self.n2w.to_currency(-1234567), + 'menos um milhão, duzentos e trinta e quatro mil, quinhentos e ' + 'sessenta e sete reais' + ) def test_currency_float(self): self.assertEqual(self.n2w.to_currency(Decimal('1.00')), 'um real') - self.assertEqual(self.n2w.to_currency(Decimal('1.01')), 'um real e um centavo') - self.assertEqual(self.n2w.to_currency(Decimal('1.035')), 'um real e três centavos') - self.assertEqual(self.n2w.to_currency(Decimal('1.35')), 'um real e trinta e cinco centavos') - self.assertEqual(self.n2w.to_currency(Decimal('3.14159')), 'três reais e catorze centavos') - self.assertEqual(self.n2w.to_currency(Decimal('101.22')), 'cento e um reais e vinte e dois centavos') - self.assertEqual(self.n2w.to_currency(Decimal('2345.75')), 'dois mil, trezentos e quarenta e cinco reais e setenta e cinco centavos') + self.assertEqual( + self.n2w.to_currency(Decimal('1.01')), 'um real e um centavo' + ) + self.assertEqual( + self.n2w.to_currency(Decimal('1.035')), 'um real e três centavos' + ) + self.assertEqual( + self.n2w.to_currency(Decimal('1.35')), + 'um real e trinta e cinco centavos' + ) + self.assertEqual( + self.n2w.to_currency(Decimal('3.14159')), + 'três reais e catorze centavos' + ) + self.assertEqual( + self.n2w.to_currency(Decimal('101.22')), + 'cento e um reais e vinte e dois centavos' + ) + self.assertEqual( + self.n2w.to_currency(Decimal('2345.75')), + 'dois mil, trezentos e quarenta e cinco reais e setenta e cinco ' + 'centavos' + ) def test_currency_float_negative(self): - self.assertEqual(self.n2w.to_currency(Decimal('-2.34')), 'menos dois reais e trinta e quatro centavos') - self.assertEqual(self.n2w.to_currency(Decimal('-9.99')), 'menos nove reais e noventa e nove centavos') - self.assertEqual(self.n2w.to_currency(Decimal('-7.01')), 'menos sete reais e um centavo') - self.assertEqual(self.n2w.to_currency(Decimal('-222.22')), 'menos duzentos e vinte e dois reais e vinte e dois centavos') + self.assertEqual( + self.n2w.to_currency(Decimal('-2.34')), + 'menos dois reais e trinta e quatro centavos' + ) + self.assertEqual( + self.n2w.to_currency(Decimal('-9.99')), + 'menos nove reais e noventa e nove centavos' + ) + self.assertEqual( + self.n2w.to_currency(Decimal('-7.01')), + 'menos sete reais e um centavo' + ) + self.assertEqual( + self.n2w.to_currency(Decimal('-222.22')), + 'menos duzentos e vinte e dois reais e vinte e dois centavos' + ) def test_year(self): self.assertEqual(self.n2w.to_year(1001), 'mil e um') - self.assertEqual(self.n2w.to_year(1789), 'mil, setecentos e oitenta e nove') - self.assertEqual(self.n2w.to_year(1942), 'mil, novecentos e quarenta e dois') - self.assertEqual(self.n2w.to_year(1984), 'mil, novecentos e oitenta e quatro') + self.assertEqual( + self.n2w.to_year(1789), 'mil, setecentos e oitenta e nove' + ) + self.assertEqual( + self.n2w.to_year(1942), 'mil, novecentos e quarenta e dois' + ) + self.assertEqual( + self.n2w.to_year(1984), 'mil, novecentos e oitenta e quatro' + ) self.assertEqual(self.n2w.to_year(2000), 'dois mil') self.assertEqual(self.n2w.to_year(2001), 'dois mil e um') self.assertEqual(self.n2w.to_year(2016), 'dois mil e dezesseis') def test_year_negative(self): self.assertEqual(self.n2w.to_year(-30), 'trinta antes de Cristo') - self.assertEqual(self.n2w.to_year(-744), 'setecentos e quarenta e quatro antes de Cristo') + self.assertEqual( + self.n2w.to_year(-744), + 'setecentos e quarenta e quatro antes de Cristo' + ) self.assertEqual(self.n2w.to_year(-10000), 'dez mil antes de Cristo') diff --git a/tests/test_ru.py b/tests/test_ru.py index d4f4087..9b1ae93 100644 --- a/tests/test_ru.py +++ b/tests/test_ru.py @@ -18,16 +18,27 @@ from unittest import TestCase from num2words import num2words + class Num2WordsRUTest(TestCase): def test_cardinal(self): self.assertEqual(num2words(5, lang='ru'), u"пять") self.assertEqual(num2words(15, lang='ru'), u"пятнадцать") self.assertEqual(num2words(154, lang='ru'), u"сто пятьдесят четыре") - self.assertEqual(num2words(1135, lang='ru'), u"одна тысяча сто тридцать пять") - self.assertEqual(num2words(418531, lang='ru'), u"четыреста восемнадцать тысяч пятьсот тридцать один") - self.assertEqual(num2words(1000139, lang='ru'), u"один миллион сто тридцать девять") + self.assertEqual( + num2words(1135, lang='ru'), u"одна тысяча сто тридцать пять" + ) + self.assertEqual( + num2words(418531, lang='ru'), + u"четыреста восемнадцать тысяч пятьсот тридцать один" + ) + self.assertEqual( + num2words(1000139, lang='ru'), u"один миллион сто тридцать девять" + ) def test_floating_point(self): self.assertEqual(num2words(5.2, lang='ru'), u"пять запятая два") - self.assertEqual(num2words(561.42, lang='ru'), u"пятьсот шестьдесят один запятая сорок два") + self.assertEqual( + num2words(561.42, lang='ru'), + u"пятьсот шестьдесят один запятая сорок два" + ) diff --git a/tests/test_sl.py b/tests/test_sl.py index b41332f..3fe5ac7 100644 --- a/tests/test_sl.py +++ b/tests/test_sl.py @@ -20,6 +20,7 @@ from unittest import TestCase from num2words import num2words + class Num2WordsDETest(TestCase): def test_ordinal_less_than_twenty(self): self.assertEqual(num2words(2, ordinal=True, lang='sl'), "drugi") @@ -30,14 +31,22 @@ class Num2WordsDETest(TestCase): self.assertEqual(num2words(17, ordinal=True, lang='sl'), "sedemnajsti") def test_ordinal_more_than_twenty(self): - self.assertEqual(num2words(81, ordinal=True, lang='sl'), "enainosemdeseti") + self.assertEqual( + num2words(81, ordinal=True, lang='sl'), "enainosemdeseti" + ) def test_ordinal_at_crucial_number(self): self.assertEqual(num2words(100, ordinal=True, lang='sl'), "stoti") self.assertEqual(num2words(1000, ordinal=True, lang='sl'), "tisoči") - self.assertEqual(num2words(4000, ordinal=True, lang='sl'), "štiritisoči") - self.assertEqual(num2words(2000000, ordinal=True, lang='sl'), "dvemiljonti") - self.assertEqual(num2words(5000000000, ordinal=True, lang='sl'), "petmiljardti") + self.assertEqual( + num2words(4000, ordinal=True, lang='sl'), "štiritisoči" + ) + self.assertEqual( + num2words(2000000, ordinal=True, lang='sl'), "dvemiljonti" + ) + self.assertEqual( + num2words(5000000000, ordinal=True, lang='sl'), "petmiljardti" + ) def test_cardinal_at_some_numbers(self): self.assertEqual(num2words(2, lang='sl'), "dve") diff --git a/tests/test_tr.py b/tests/test_tr.py index 3e9753d..f7f7dc6 100644 --- a/tests/test_tr.py +++ b/tests/test_tr.py @@ -41,32 +41,69 @@ class Num2WordsTRTest(TestCase): self.assertEqual(num2words(1011, True, "tr"), u"binonbirinci") self.assertEqual(num2words(1100, True, "tr"), u"binyüzüncü") self.assertEqual(num2words(1110, True, "tr"), u"binyüzonuncu") - self.assertEqual(num2words(2341, True, "tr"), u"ikibinüçyüzkırkbirinci") + self.assertEqual( + num2words(2341, True, "tr"), u"ikibinüçyüzkırkbirinci" + ) self.assertEqual(num2words(10000, True, "tr"), u"onbininci") self.assertEqual(num2words(10010, True, "tr"), u"onbinonuncu") self.assertEqual(num2words(10100, True, "tr"), u"onbinyüzüncü") self.assertEqual(num2words(10110, True, "tr"), u"onbinyüzonuncu") self.assertEqual(num2words(11000, True, "tr"), u"onbirbininci") self.assertEqual(num2words(35000, True, "tr"), u"otuzbeşbininci") - self.assertEqual(num2words(116331, True, "tr"), u"yüzonaltıbinüçyüzotuzbirinci") - self.assertEqual(num2words(116330, True, "tr"), u"yüzonaltıbinüçyüzotuzuncu") + self.assertEqual( + num2words(116331, True, "tr"), u"yüzonaltıbinüçyüzotuzbirinci" + ) + self.assertEqual( + num2words(116330, True, "tr"), u"yüzonaltıbinüçyüzotuzuncu" + ) self.assertEqual(num2words(100000, True, "tr"), u"yüzbininci") self.assertEqual(num2words(501000, True, "tr"), u"beşyüzbirbininci") - self.assertEqual(num2words(1000111, True, "tr"), u"birmilyonyüzonbirinci") - self.assertEqual(num2words(111000111, True, "tr"), u"yüzonbirmilyonyüzonbirinci") - self.assertEqual(num2words(111001111, True, "tr"), u"yüzonbirmilyonbinyüzonbirinci") - self.assertEqual(num2words(111111111, True, "tr"), u"yüzonbirmilyonyüzonbirbinyüzonbirinci") + self.assertEqual( + num2words(1000111, True, "tr"), u"birmilyonyüzonbirinci" + ) + self.assertEqual( + num2words(111000111, True, "tr"), u"yüzonbirmilyonyüzonbirinci" + ) + self.assertEqual( + num2words(111001111, True, "tr"), u"yüzonbirmilyonbinyüzonbirinci" + ) + self.assertEqual( + num2words(111111111, True, "tr"), + u"yüzonbirmilyonyüzonbirbinyüzonbirinci" + ) self.assertEqual(num2words(100001000, True, "tr"), u"yüzmilyonbininci") - self.assertEqual(num2words(100001001, True, "tr"), u"yüzmilyonbinbirinci") - self.assertEqual(num2words(100010000, True, "tr"), u"yüzmilyononbininci") - self.assertEqual(num2words(100010001, True, "tr"), u"yüzmilyononbinbirinci") - self.assertEqual(num2words(100011000, True, "tr"), u"yüzmilyononbirbininci") - self.assertEqual(num2words(100011001, True, "tr"), u"yüzmilyononbirbinbirinci") - self.assertEqual(num2words(101011001, True, "tr"), u"yüzbirmilyononbirbinbirinci") - self.assertEqual(num2words(101011010, True, "tr"), u"yüzbirmilyononbirbinonuncu") - self.assertEqual(num2words(1101011010, True, "tr"), u"birmilyaryüzbirmilyononbirbinonuncu") - self.assertEqual(num2words(101101011010, True, "tr"), u"yüzbirmilyaryüzbirmilyononbirbinonuncu") - self.assertEqual(num2words(1000000000001, True, "tr"), u"birtrilyonbirinci") + self.assertEqual( + num2words(100001001, True, "tr"), u"yüzmilyonbinbirinci" + ) + self.assertEqual( + num2words(100010000, True, "tr"), u"yüzmilyononbininci" + ) + self.assertEqual( + num2words(100010001, True, "tr"), u"yüzmilyononbinbirinci" + ) + self.assertEqual( + num2words(100011000, True, "tr"), u"yüzmilyononbirbininci" + ) + self.assertEqual( + num2words(100011001, True, "tr"), u"yüzmilyononbirbinbirinci" + ) + self.assertEqual( + num2words(101011001, True, "tr"), u"yüzbirmilyononbirbinbirinci" + ) + self.assertEqual( + num2words(101011010, True, "tr"), u"yüzbirmilyononbirbinonuncu" + ) + self.assertEqual( + num2words(1101011010, True, "tr"), + u"birmilyaryüzbirmilyononbirbinonuncu" + ) + self.assertEqual( + num2words(101101011010, True, "tr"), + u"yüzbirmilyaryüzbirmilyononbirbinonuncu" + ) + self.assertEqual( + num2words(1000000000001, True, "tr"), u"birtrilyonbirinci" + ) self.assertEqual(num2words(1, False, "tr"), u"bir") self.assertEqual(num2words(2, False, "tr"), u"iki") @@ -92,30 +129,65 @@ class Num2WordsTRTest(TestCase): self.assertEqual(num2words(10110, False, "tr"), u"onbinyüzon") self.assertEqual(num2words(11000, False, "tr"), u"onbirbin") self.assertEqual(num2words(35000, False, "tr"), u"otuzbeşbin") - self.assertEqual(num2words(116331, False, "tr"), u"yüzonaltıbinüçyüzotuzbir") - self.assertEqual(num2words(116330, False, "tr"), u"yüzonaltıbinüçyüzotuz") + self.assertEqual( + num2words(116331, False, "tr"), u"yüzonaltıbinüçyüzotuzbir" + ) + self.assertEqual( + num2words(116330, False, "tr"), u"yüzonaltıbinüçyüzotuz" + ) self.assertEqual(num2words(500000, False, "tr"), u"beşyüzbin") self.assertEqual(num2words(501000, False, "tr"), u"beşyüzbirbin") self.assertEqual(num2words(1000111, False, "tr"), u"birmilyonyüzonbir") - self.assertEqual(num2words(111000111, False, "tr"), u"yüzonbirmilyonyüzonbir") - self.assertEqual(num2words(111001111, False, "tr"), u"yüzonbirmilyonbinyüzonbir") - self.assertEqual(num2words(111111111, False, "tr"), u"yüzonbirmilyonyüzonbirbinyüzonbir") + self.assertEqual( + num2words(111000111, False, "tr"), u"yüzonbirmilyonyüzonbir" + ) + self.assertEqual( + num2words(111001111, False, "tr"), u"yüzonbirmilyonbinyüzonbir" + ) + self.assertEqual( + num2words(111111111, False, "tr"), + u"yüzonbirmilyonyüzonbirbinyüzonbir" + ) self.assertEqual(num2words(100001000, False, "tr"), u"yüzmilyonbin") self.assertEqual(num2words(100001001, False, "tr"), u"yüzmilyonbinbir") self.assertEqual(num2words(100010000, False, "tr"), u"yüzmilyononbin") - self.assertEqual(num2words(100010001, False, "tr"), u"yüzmilyononbinbir") - self.assertEqual(num2words(100011000, False, "tr"), u"yüzmilyononbirbin") - self.assertEqual(num2words(100011001, False, "tr"), u"yüzmilyononbirbinbir") - self.assertEqual(num2words(101011001, False, "tr"), u"yüzbirmilyononbirbinbir") - self.assertEqual(num2words(101011010, False, "tr"), u"yüzbirmilyononbirbinon") - self.assertEqual(num2words(1101011010, False, "tr"), u"birmilyaryüzbirmilyononbirbinon") - self.assertEqual(num2words(101101011010, False, "tr"), u"yüzbirmilyaryüzbirmilyononbirbinon") - self.assertEqual(num2words(1000000000001, False, "tr"), u"birtrilyonbir") + self.assertEqual( + num2words(100010001, False, "tr"), u"yüzmilyononbinbir" + ) + self.assertEqual( + num2words(100011000, False, "tr"), u"yüzmilyononbirbin" + ) + self.assertEqual( + num2words(100011001, False, "tr"), u"yüzmilyononbirbinbir" + ) + self.assertEqual( + num2words(101011001, False, "tr"), u"yüzbirmilyononbirbinbir" + ) + self.assertEqual( + num2words(101011010, False, "tr"), u"yüzbirmilyononbirbinon" + ) + self.assertEqual( + num2words(1101011010, False, "tr"), + u"birmilyaryüzbirmilyononbirbinon" + ) + self.assertEqual( + num2words(101101011010, False, "tr"), + u"yüzbirmilyaryüzbirmilyononbirbinon" + ) + self.assertEqual( + num2words(1000000000001, False, "tr"), u"birtrilyonbir" + ) self.assertEqual(num2words(0.01, False, "tr"), u"sıfırvirgülbir") self.assertEqual(num2words(0.1, False, "tr"), u"sıfırvirgülon") self.assertEqual(num2words(0.21, False, "tr"), u"sıfırvirgülyirmibir") self.assertEqual(num2words(1.01, False, "tr"), u"birvirgülbir") self.assertEqual(num2words(1.1, False, "tr"), u"birvirgülon") self.assertEqual(num2words(1.21, False, "tr"), u"birvirgülyirmibir") - self.assertEqual(num2words(101101011010.02, False, "tr"), u"yüzbirmilyaryüzbirmilyononbirbinonvirgüliki") - self.assertEqual(num2words(101101011010.2, False, "tr"), u"yüzbirmilyaryüzbirmilyononbirbinonvirgülyirmi") + self.assertEqual( + num2words(101101011010.02, False, "tr"), + u"yüzbirmilyaryüzbirmilyononbirbinonvirgüliki" + ) + self.assertEqual( + num2words(101101011010.2, False, "tr"), + u"yüzbirmilyaryüzbirmilyononbirbinonvirgülyirmi" + ) diff --git a/tests/test_uk.py b/tests/test_uk.py index 26760ae..8c20cbc 100644 --- a/tests/test_uk.py +++ b/tests/test_uk.py @@ -18,12 +18,21 @@ from unittest import TestCase from num2words import num2words + class Num2WordsUKTest(TestCase): def test_and_join_199(self): - self.assertEqual(num2words(187,lang='uk'), u"сто вiсiмдесят сiм") + self.assertEqual(num2words(187, lang='uk'), u"сто вiсiмдесят сiм") def test_cardinal_for_float_number(self): - self.assertEqual(num2words(12.40,lang='uk'), u"дванадцять кома чотири") - self.assertEqual(num2words(17.31,lang='uk'), u"сiмнадцять кома тридцять одна") - self.assertEqual(num2words(14.13,lang='uk'), u"чотирнадцять кома тринадцять") - self.assertEqual(num2words(12.31,lang='uk'), u"дванадцять кома тридцять одна") + self.assertEqual( + num2words(12.40, lang='uk'), u"дванадцять кома чотири" + ) + self.assertEqual( + num2words(17.31, lang='uk'), u"сiмнадцять кома тридцять одна" + ) + self.assertEqual( + num2words(14.13, lang='uk'), u"чотирнадцять кома тринадцять" + ) + self.assertEqual( + num2words(12.31, lang='uk'), u"дванадцять кома тридцять одна" + ) diff --git a/tests/test_vn.py b/tests/test_vn.py index bf357b3..77bfdf8 100644 --- a/tests/test_vn.py +++ b/tests/test_vn.py @@ -15,11 +15,13 @@ # MA 02110-1301 USA from __future__ import unicode_literals + from unittest import TestCase + from num2words import num2words -class Num2WordsVNTest(TestCase): +class Num2WordsVNTest(TestCase): def test_0(self): self.assertEqual(num2words(0, lang="vi_VN"), "không") @@ -50,35 +52,57 @@ class Num2WordsVNTest(TestCase): def test_100_to_999(self): self.assertEqual(num2words(100, lang="vi_VN"), "một trăm") self.assertEqual(num2words(150, lang="vi_VN"), "một trăm năm mươi") - self.assertEqual(num2words(196, lang="vi_VN"), "một trăm chín mươi sáu") + self.assertEqual( + num2words(196, lang="vi_VN"), "một trăm chín mươi sáu" + ) self.assertEqual(num2words(200, lang="vi_VN"), "hai trăm") self.assertEqual(num2words(210, lang="vi_VN"), "hai trăm mười") def test_1000_to_9999(self): self.assertEqual(num2words(1000, lang="vi_VN"), "một nghìn") self.assertEqual(num2words(1500, lang="vi_VN"), "một nghìn năm trăm") - self.assertEqual(num2words(7378, lang="vi_VN"), "bảy nghìn ba trăm bảy mươi tám") + self.assertEqual( + num2words(7378, lang="vi_VN"), "bảy nghìn ba trăm bảy mươi tám" + ) self.assertEqual(num2words(2000, lang="vi_VN"), "hai nghìn") self.assertEqual(num2words(2100, lang="vi_VN"), "hai nghìn một trăm") - self.assertEqual(num2words(6870, lang="vi_VN"), "sáu nghìn tám trăm bảy mươi") + self.assertEqual( + num2words(6870, lang="vi_VN"), "sáu nghìn tám trăm bảy mươi" + ) self.assertEqual(num2words(10000, lang="vi_VN"), "mười nghìn") self.assertEqual(num2words(100000, lang="vi_VN"), "một trăm nghìn") - self.assertEqual(num2words(523456, lang="vi_VN"), "năm trăm hai mươi ba nghìn bốn trăm năm mươi sáu") + self.assertEqual( + num2words(523456, lang="vi_VN"), + "năm trăm hai mươi ba nghìn bốn trăm năm mươi sáu" + ) def test_big(self): self.assertEqual(num2words(1000000, lang="vi_VN"), "một triệu") - self.assertEqual(num2words(1200000, lang="vi_VN"), "một triệu hai trăm nghìn") + self.assertEqual( + num2words(1200000, lang="vi_VN"), "một triệu hai trăm nghìn" + ) self.assertEqual(num2words(3000000, lang="vi_VN"), "ba triệu") - self.assertEqual(num2words(3800000, lang="vi_VN"), "ba triệu tám trăm nghìn") + self.assertEqual( + num2words(3800000, lang="vi_VN"), "ba triệu tám trăm nghìn" + ) self.assertEqual(num2words(1000000000, lang="vi_VN"), "một tỷ") self.assertEqual(num2words(2000000000, lang="vi_VN"), "hai tỷ") - self.assertEqual(num2words(2000001000, lang="vi_VN"), "hai tỷ một nghìn") - self.assertEqual(num2words(1234567890, lang="vi_VN"), "một tỷ hai trăm ba mươi bốn triệu năm trăm sáu mươi bảy nghìn tám trăm chín mươi") - + self.assertEqual( + num2words(2000001000, lang="vi_VN"), "hai tỷ một nghìn" + ) + self.assertEqual( + num2words(1234567890, lang="vi_VN"), + "một tỷ hai trăm ba mươi bốn triệu năm trăm sáu mươi bảy nghìn " + "tám trăm chín mươi" + ) def test_decimal_number(self): - self.assertEqual(num2words(1000.11, lang="vi_VN"), "một nghìn phẩy mười một") - self.assertEqual(num2words(1000.21, lang="vi_VN"), "một nghìn phẩy hai mươi mốt") + self.assertEqual( + num2words(1000.11, lang="vi_VN"), "một nghìn phẩy mười một" + ) + self.assertEqual( + num2words(1000.21, lang="vi_VN"), "một nghìn phẩy hai mươi mốt" + ) def test_special_number(self): """ @@ -95,12 +119,20 @@ class Num2WordsVNTest(TestCase): # >1000 self.assertEqual(num2words(1001, lang="vi_VN"), "một nghìn lẻ một") self.assertEqual(num2words(1005, lang="vi_VN"), "một nghìn lẻ năm") - self.assertEqual(num2words(98765, lang="vi_VN"), "chín mươi tám nghìn bảy trăm sáu mươi lăm") + self.assertEqual( + num2words(98765, lang="vi_VN"), + "chín mươi tám nghìn bảy trăm sáu mươi lăm" + ) # > 1000000 self.assertEqual(num2words(3000005, lang="vi_VN"), "ba triệu lẻ năm") self.assertEqual(num2words(1000007, lang="vi_VN"), "một triệu lẻ bảy") # > 1000000000 - self.assertEqual(num2words(1000000017, lang="vi_VN"), "một tỷ lẻ mười bảy") - self.assertEqual(num2words(1000101017, lang="vi_VN"), "một tỷ một trăm lẻ một nghìn lẻ mười bảy") + self.assertEqual( + num2words(1000000017, lang="vi_VN"), "một tỷ lẻ mười bảy" + ) + self.assertEqual( + num2words(1000101017, lang="vi_VN"), + "một tỷ một trăm lẻ một nghìn lẻ mười bảy" + ) diff --git a/tox.ini b/tox.ini index d39d777..70d5de5 100644 --- a/tox.ini +++ b/tox.ini @@ -2,18 +2,14 @@ envlist = flake8, isort, py27,py34,py35,py36 [testenv] +passenv = TRAVIS TRAVIS_* deps = -r{toxinidir}/requirements-test.txt commands = + flake8 + isort --check-only --recursive --diff num2words tests coverage erase coverage run -m unittest discover coverage report --fail-under=75 --omit=.tox/*,/usr/* - -[testenv:flake8] -commands= - flake8 - -[testenv:isort] -commands= - isort --check-only --recursive --diff num2words tests + coveralls