bblaz/num2words
1
0
Fork 0
mirror of https://github.com/bblaz/num2words.git synced 2025-12-06 06:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated failing flake8 test

Browse Source
This commit is contained in:
Peter Nordstrom
2021-01-26 08:40:17 +01:00
parent 3b52c5f924
commit e6fb2b128b
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
num2words/__init__.py
View File

@@ -22,8 +22,8 @@ from . import (lang_AR, lang_CZ, lang_DE, lang_DK, lang_EN, lang_EN_IN,
lang_FR_BE, lang_FR_CH, lang_FR_DZ, lang_HE, lang_HU, lang_ID, 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_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_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_RU, lang_SL, lang_SR, lang_SV, lang_TE, lang_TH, lang_TR,
lang_VI) lang_UK, lang_VI)
CONVERTER_CLASSES = { CONVERTER_CLASSES = {
'ar': lang_AR.Num2Word_AR(), 'ar': lang_AR.Num2Word_AR(),
@@ -68,7 +68,6 @@ CONVERTER_CLASSES = {
'hu': lang_HU.Num2Word_HU() 'hu': lang_HU.Num2Word_HU()
} }
CONVERTES_TYPES = ['cardinal', 'ordinal', 'ordinal_num', 'year', 'currency'] CONVERTES_TYPES = ['cardinal', 'ordinal', 'ordinal_num', 'year', 'currency']

4
num2words/lang_SV.py
View File

@@ -86,17 +86,15 @@ class Num2Word_SV(lang_EU.Num2Word_EU):
self.verify_ordinal(value) self.verify_ordinal(value)
outwords = self.to_cardinal(value).split(" ") outwords = self.to_cardinal(value).split(" ")
lastword = outwords[-1] lastword = outwords[-1]
# lastword = lastwords[-1].lower()
ending_length = 0 ending_length = 0
try: try:
lastword_ending = self.ords[lastword[-4:]] lastword_ending = self.ords[lastword[-4:]]
ending_length = 4 ending_length = 4
except: except KeyError:
try: try:
lastword_ending = self.ords[lastword[-3:]] lastword_ending = self.ords[lastword[-3:]]
ending_length = 3 ending_length = 3
except KeyError: except KeyError:
# lastword += "de"
lastword_ending = "de" lastword_ending = "de"
if lastword_ending == 'de': if lastword_ending == 'de':
lastword_first_part = self.title(lastword)[:] lastword_first_part = self.title(lastword)[:]

37
tests/test_sv.py
View File

@@ -25,8 +25,10 @@ from num2words import num2words
class Num2WordsSVTest(TestCase): class Num2WordsSVTest(TestCase):
def test_ordinal(self): def test_ordinal(self):
self.assertEqual(num2words(14, to="ordinal", lang="sv"), "fjortonde") self.assertEqual(num2words(14, to="ordinal", lang="sv"), "fjortonde")
self.assertEqual(num2words(1435, to="ordinal", lang="sv"), "etttusen fyrahundratrettiofemte") self.assertEqual(num2words(1435, to="ordinal", lang="sv"),
self.assertEqual(num2words(32, to="ordinal", lang="sv"), "trettioandra") "etttusen fyrahundratrettiofemte")
self.assertEqual(num2words(32, to="ordinal", lang="sv"),
"trettioandra")
self.assertEqual(num2words(1, to="ordinal", lang="sv"), "första") self.assertEqual(num2words(1, to="ordinal", lang="sv"), "första")
self.assertEqual(num2words(5, to="ordinal", lang="sv"), "femte") self.assertEqual(num2words(5, to="ordinal", lang="sv"), "femte")
self.assertEqual(num2words(10, to="ordinal", lang="sv"), "tionde") self.assertEqual(num2words(10, to="ordinal", lang="sv"), "tionde")
@@ -34,28 +36,35 @@ class Num2WordsSVTest(TestCase):
def test_cardinal(self): def test_cardinal(self):
self.assertEqual(num2words(0, to="cardinal", lang="sv"), "noll") self.assertEqual(num2words(0, to="cardinal", lang="sv"), "noll")
self.assertEqual(num2words(1, to="cardinal", lang="sv"), "ett") self.assertEqual(num2words(1, to="cardinal", lang="sv"), "ett")
self.assertEqual(num2words(2, to="cardinal", lang="sv"), "två") self.assertEqual(num2words(3, to="cardinal", lang="sv"), "tre")
self.assertEqual(num2words(5, to="cardinal", lang="sv"), "fem") self.assertEqual(num2words(5, to="cardinal", lang="sv"), "fem")
self.assertEqual(num2words(8, to="cardinal", lang="sv"), "åtta")
self.assertEqual(num2words(18, to="cardinal", lang="sv"), "arton") self.assertEqual(num2words(18, to="cardinal", lang="sv"), "arton")
self.assertEqual(num2words(45, to="cardinal", lang="sv"), "förtiofem") self.assertEqual(num2words(45, to="cardinal", lang="sv"), "förtiofem")
self.assertEqual(num2words(1245, to="cardinal", lang="sv"), "etttusen tvåhundraförtiofem") self.assertEqual(num2words(1345, to="cardinal", lang="sv"),
self.assertEqual(num2words(4235, to="cardinal", lang="sv"), "fyratusen tvåhundratrettiofem") "etttusen trehundraförtiofem")
self.assertEqual(num2words(1004135, to="cardinal", lang="sv"), "en miljon fyratusen etthundratrettiofem") self.assertEqual(num2words(4435, to="cardinal", lang="sv"),
self.assertEqual(num2words(14004235000, to="cardinal", lang="sv"), "fjorton miljarder fyra miljoner tvåhundratrettiofemtusen") "fyratusen fyrahundratrettiofem")
self.assertEqual(num2words(14004235, to="cardinal", lang="sv"), "fjorton miljoner fyratusen tvåhundratrettiofem") self.assertEqual(num2words(1004135, to="cardinal", lang="sv"),
self.assertEqual(num2words(1.25, to="cardinal", lang="sv"), "ett komma två fem") "en miljon fyratusen etthundratrettiofem")
self.assertEqual(num2words(4335000, to="cardinal", lang="sv"),
"fyra miljoner trehundratrettiofemtusen")
self.assertEqual(num2words(14004535, to="cardinal", lang="sv"),
"fjorton miljoner fyratusen femhundratrettiofem")
self.assertEqual(num2words(1.5, to="cardinal", lang="sv"),
"ett komma fem")
def test_not_implemented_options(self): def test_not_implemented_options(self):
with self.assertRaises(NotImplementedError) as context: with self.assertRaises(NotImplementedError) as context:
num2words(1235, to="year", lang="sv") num2words(1235, to="year", lang="sv")
self.assertTrue("'year' is not implemented for swedish language" in str(context.exception)) self.assertTrue("'year' is not implemented for swedish language"
in str(context.exception))
with self.assertRaises(NotImplementedError) as context: with self.assertRaises(NotImplementedError) as context:
num2words(1235, to="currency", lang="sv") num2words(1235, to="currency", lang="sv")
self.assertTrue("'currency' is not implemented for swedish language" in str(context.exception)) self.assertTrue("'currency' is not implemented for swedish language"
in str(context.exception))
with self.assertRaises(NotImplementedError) as context: with self.assertRaises(NotImplementedError) as context:
num2words(1235, to="ordinal_num", lang="sv") num2words(1235, to="ordinal_num", lang="sv")
self.assertTrue("'ordinal_num' is not implemented for swedish language" in str(context.exception)) self.assertTrue("'ordinal_num' is not implemented for swedish language"
in str(context.exception))