Fix flake 8 requirements in python3.1 and increase test coverage.

This commit is contained in:
Eyosiyas Bereketab
2022-08-09 11:14:40 +03:00
committed by Willem Van Onsem
parent a5a812d421
commit 5948065b36
3 changed files with 34 additions and 15 deletions

View File

@@ -17,17 +17,17 @@
from __future__ import unicode_literals
from . import (lang_AR, lang_CZ, lang_DE, lang_DK, lang_EN, lang_EN_IN,
lang_ES, lang_ES_CO, lang_ES_NI, lang_ES_VE, lang_FA, lang_FI,
lang_FR, lang_FR_BE, lang_FR_CH, lang_FR_DZ, lang_HE, lang_HU,
lang_ID, lang_IT, lang_JA, lang_KN, lang_KO, lang_KZ, lang_LT,
lang_LV, lang_NL, lang_NO, lang_PL, lang_PT, lang_PT_BR,
lang_RO, lang_RU, lang_SL, lang_SR, lang_SV, lang_TE, lang_TH,
lang_TR, lang_UK, lang_VI, lang_AM)
from . import (lang_AM, lang_AR, lang_CZ, lang_DE, lang_DK, lang_EN,
lang_EN_IN, lang_ES, lang_ES_CO, lang_ES_NI, lang_ES_VE,
lang_FA, lang_FI, lang_FR, lang_FR_BE, lang_FR_CH, lang_FR_DZ,
lang_HE, lang_HU, lang_ID, lang_IT, lang_JA, lang_KN, lang_KO,
lang_KZ, lang_LT, lang_LV, lang_NL, lang_NO, lang_PL, lang_PT,
lang_PT_BR, lang_RO, lang_RU, lang_SL, lang_SR, lang_SV, lang_TE,
lang_TH, lang_TR, lang_UK, lang_VI)
CONVERTER_CLASSES = {
'ar': lang_AR.Num2Word_AR(),
'am': lang_AM.Num2Word_AM(),
'ar': lang_AR.Num2Word_AR(),
'cz': lang_CZ.Num2Word_CZ(),
'en': lang_EN.Num2Word_EN(),
'en_IN': lang_EN_IN.Num2Word_EN_IN(),

View File

@@ -93,7 +93,7 @@ class Num2Word_AM(lang_EU.Num2Word_EU):
def to_ordinal_num(self, value):
self.verify_ordinal(value)
return "%s%s" % (value, self.to_ordinal(value)[-2:])
return "%s%s" % (value, self.to_ordinal(value)[-1:])
def to_currency(self, val, currency='ብር', cents=True, separator='',
adjective=True):

View File

@@ -38,19 +38,38 @@ class Num2WordsAMTest(TestCase):
'ሃያ ሁለተኛ'
)
def test_ordinal_num(self):
self.assertEqual(num2words(10, lang='am', to='ordinal_num'), '10ኛ')
self.assertEqual(num2words(21, lang='am', to='ordinal_num'), '21ኛ')
self.assertEqual(num2words(102, lang='am', to='ordinal_num'), '102ኛ')
def test_cardinal_for_float_number(self):
self.assertEqual(num2words(12.5, lang='am'), "አሥራ ሁለት ነጥብ አምስት")
self.assertEqual(num2words(12.51, lang='am'), "አሥራ ሁለት ነጥብ አምስት አንድ")
self.assertEqual(num2words(12.53, lang='am'), "አሥራ ሁለት ነጥብ አምስት ሦስት")
def test_overflow(self):
with self.assertRaises(OverflowError):
num2words("1000000000000000000000000000000000000000000000000000000"
"0000000000000000000000000000000000000000000000000000000"
"0000000000000000000000000000000000000000000000000000000"
"0000000000000000000000000000000000000000000000000000000"
"0000000000000000000000000000000000000000000000000000000"
"00000000000000000000000000000000", lang='am')
def test_to_currency(self):
self.assertEqual(
num2words('38.4', lang='am', to='currency', cents=False, currency='ETB'),
"ሠላሳ ስምንት ብር ከ 40 ሳንቲም"
num2words('38.4', lang='am', to='currency', cents=False,
currency='ETB'), "ሠላሳ ስምንት ብር ከ 40 ሳንቲም"
)
self.assertEqual(
num2words('0', lang='am', to='currency', separator=' እና', cents=True, currency='ETB'),
"ዜሮ ብር እና ዜሮ ሳንቲም"
num2words('0', lang='am', to='currency', separator=' እና',
cents=True, currency='ETB'), "ዜሮ ብር እና ዜሮ ሳንቲም"
)
self.assertEqual(
num2words('1.50', lang='am', to='currency', cents=True, currency='ETB'),
"አንድ ብር ከ አምሳ ሳንቲም"
num2words('1.50', lang='am', to='currency', cents=True,
currency='ETB'), "አንድ ብር ከ አምሳ ሳንቲም"
)
def test_to_year(self):