From 0600fbb1837e59f98050518508e6eaede860910d Mon Sep 17 00:00:00 2001 From: William Moreno Reyes Date: Tue, 24 Oct 2017 17:48:51 -0600 Subject: [PATCH] Fix many to long lines issues Signed-off-by: William Moreno Reyes --- num2words/lang_DE.py | 31 ++++++++++++------ num2words/lang_DK.py | 6 ++-- num2words/lang_ES.py | 31 ++++++++++++++---- num2words/lang_ES_VE.py | 4 ++- num2words/lang_FR.py | 4 ++- num2words/lang_FR_CH.py | 6 ++-- num2words/lang_ID.py | 12 +++++-- num2words/lang_LT.py | 3 +- num2words/lang_NL.py | 34 +++++++++++++------ num2words/lang_NO.py | 3 +- num2words/lang_SL.py | 65 +++++++++++++++++++------------------ num2words/lang_UK.py | 7 ++-- num2words/orderedmapping.py | 1 + 13 files changed, 131 insertions(+), 76 deletions(-) diff --git a/num2words/lang_DE.py b/num2words/lang_DE.py index 385300b..3d99db2 100644 --- a/num2words/lang_DE.py +++ b/num2words/lang_DE.py @@ -30,13 +30,22 @@ class Num2Word_DE(Num2Word_EU): def setup(self): self.negword = "minus " self.pointword = "Komma" - self.errmsg_floatord = "Die Gleitkommazahl %s kann nicht in eine Ordnungszahl konvertiert werden." # "Cannot treat float %s as ordinal." - self.errmsg_nonnum = "Nur Zahlen (type(%s)) können in Wörter konvertiert werden." + self.errmsg_floatord = ( + "Die Gleitkommazahl %s kann nicht in eine Ordnungszahl " + + "konvertiert werden." + ) # "type(((type(%s)) ) not in [long, int, float]" - self.errmsg_negord = "Die negative Zahl %s kann nicht in eine Ordnungszahl konvertiert werden." + self.errmsg_nonnum = ( + "Nur Zahlen (type(%s)) können in Wörter konvertiert werden." + ) # "Cannot treat negative num %s as ordinal." - self.errmsg_toobig = "Die Zahl %s muss kleiner als %s sein." # "abs(%s) must be less than %s." + self.errmsg_negord = ( + "Die negative Zahl %s kann nicht in eine Ordnungszahl " + + "konvertiert werden." + ) + # "abs(%s) must be less than %s." + self.errmsg_toobig = "Die Zahl %s muss kleiner als %s sein." self.exclude_title = [] lows = ["non", "okt", "sept", "sext", "quint", "quadr", "tr", "b", "m"] @@ -44,16 +53,18 @@ class Num2Word_DE(Num2Word_EU): "okto", "novem"] tens = ["dez", "vigint", "trigint", "quadragint", "quinquagint", "sexagint", "septuagint", "oktogint", "nonagint"] - self.high_numwords = ["zent"] + self.gen_high_numwords(units, tens, lows) + 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"), (40, "vierzig"), - (30, "drei\xDFig")] + (60, "sechzig"), (50, "f\xFCnfzig"), + (40, "vierzig"), (30, "drei\xDFig")] self.low_numwords = ["zwanzig", "neunzehn", "achtzehn", "siebzehn", "sechzehn", "f\xFCnfzehn", "vierzehn", "dreizehn", - "zw\xF6lf", "elf", "zehn", "neun", "acht", "sieben", - "sechs", "f\xFCnf", "vier", "drei", "zwei", "eins", - "null"] + "zw\xF6lf", "elf", "zehn", "neun", "acht", + "sieben", "sechs", "f\xFCnf", "vier", "drei", + "zwei", "eins", "null"] self.ords = {"eins": "ers", "drei": "drit", "acht": "ach", diff --git a/num2words/lang_DK.py b/num2words/lang_DK.py index 3d9ce36..0aed83b 100644 --- a/num2words/lang_DK.py +++ b/num2words/lang_DK.py @@ -32,9 +32,9 @@ class Num2Word_DK(lang_EU.Num2Word_EU): self.exclude_title = ["og", "komma", "minus"] self.mid_numwords = [(1000, "tusind"), (100, "hundrede"), - (90, "halvfems"), (80, "firs"), (70, "halvfjerds"), - (60, "treds"), (50, "halvtreds"), (40, "fyrre"), - (30, "tredive")] + (90, "halvfems"), (80, "firs"), + (70, "halvfjerds"), (60, "treds"), + (50, "halvtreds"), (40, "fyrre"), (30, "tredive")] self.low_numwords = ["tyve", "nitten", "atten", "sytten", "seksten", "femten", "fjorten", "tretten", "tolv", "elleve", "ti", "ni", "otte", diff --git a/num2words/lang_ES.py b/num2words/lang_ES.py index def0358..dff726d 100644 --- a/num2words/lang_ES.py +++ b/num2words/lang_ES.py @@ -34,12 +34,15 @@ class Num2Word_ES(Num2Word_EU): self.negword = "menos " self.pointword = "punto" self.errmsg_nonnum = "Solo números pueden ser convertidos a palabras." - self.errmsg_toobig = "Numero muy grande para ser convertido a palabras." + self.errmsg_toobig = ( + "Numero muy grande para ser convertido a palabras." + ) self.gender_stem = "o" self.exclude_title = ["y", "menos", "punto"] self.mid_numwords = [(1000, "mil"), (100, "cien"), (90, "noventa"), (80, "ochenta"), (70, "setenta"), (60, "sesenta"), - (50, "cincuenta"), (40, "cuarenta"), (30, "treinta")] + (50, "cincuenta"), (40, "cuarenta"), + (30, "treinta")] self.low_numwords = ["veintinueve", "veintiocho", "veintisiete", "veintiséis", "veinticinco", "veinticuatro", "veintitrés", "veintidós", "veintiuno", @@ -120,13 +123,22 @@ class Num2Word_ES(Num2Word_EU): elif value <= 10: text = "%s%s" % (self.ords[value], self.gender_stem) elif value <= 12: - text = "%s%s%s" % (self.ords[10], self.gender_stem, self.to_ordinal(value - 10)) + text = ( + "%s%s%s" % (self.ords[10], self.gender_stem, + self.to_ordinal(value - 10)) + ) elif value <= 100: dec = (value // 10) * 10 - text = "%s%s %s" % (self.ords[dec], self.gender_stem, self.to_ordinal(value - dec)) + text = ( + "%s%s %s" % (self.ords[dec], self.gender_stem, + self.to_ordinal(value - dec)) + ) elif value <= 1e3: cen = (value // 100) * 100 - text = "%s%s %s" % (self.ords[cen], self.gender_stem, self.to_ordinal(value - cen)) + text = ( + "%s%s %s" % (self.ords[cen], self.gender_stem, + self.to_ordinal(value - cen)) + ) elif value < 1e18: # dec contains the following: # [ 1e3, 1e6): 1e3 @@ -136,8 +148,13 @@ class Num2Word_ES(Num2Word_EU): # [1e15, 1e18): 1e15 dec = 10 ** ((((len(str(int(value))) - 1) / 3 - 1) + 1) * 3) part = int(float(value / dec) * dec) - cardinal = self.to_cardinal(part / dec) if part / dec != 1 else "" - text = "%s%s%s %s" % (cardinal, self.ords[dec], self.gender_stem, self.to_ordinal(value - part)) + cardinal = ( + self.to_cardinal(part / dec) if part / dec != 1 else "" + ) + text = ( + "%s%s%s %s" % (cardinal, self.ords[dec], self.gender_stem, + self.to_ordinal(value - part)) + ) else: text = self.to_cardinal(value) except KeyError: diff --git a/num2words/lang_ES_VE.py b/num2words/lang_ES_VE.py index 974daf3..392d979 100644 --- a/num2words/lang_ES_VE.py +++ b/num2words/lang_ES_VE.py @@ -23,9 +23,11 @@ from .lang_ES import Num2Word_ES class Num2Word_ES_VE(Num2Word_ES): def to_currency(self, val, longval=True, old=False): - return self.to_splitnum(val, hightxt="bolívar/es Fuerte/s", lowtxt="bolívar/es fuerte/s", + return self.to_splitnum(val, hightxt="bolívar/es Fuerte/s", + lowtxt="bolívar/es fuerte/s", divisor=1000, jointxt="y", longval=longval) + n2w = Num2Word_ES_VE() to_card = n2w.to_cardinal to_ord = n2w.to_ordinal diff --git a/num2words/lang_FR.py b/num2words/lang_FR.py index a8f3907..c5d62a1 100644 --- a/num2words/lang_FR.py +++ b/num2words/lang_FR.py @@ -25,7 +25,9 @@ class Num2Word_FR(Num2Word_EU): self.negword = "moins " self.pointword = "virgule" - self.errmsg_nonnum = u"Seulement des nombres peuvent être convertis en mots." + self.errmsg_nonnum = ( + u"Seulement des nombres peuvent être convertis en mots." + ) self.errmsg_toobig = u"Nombre trop grand pour être converti en mots." self.exclude_title = ["et", "virgule", "moins"] self.mid_numwords = [(1000, "mille"), (100, "cent"), diff --git a/num2words/lang_FR_CH.py b/num2words/lang_FR_CH.py index 3a8561b..716d89a 100644 --- a/num2words/lang_FR_CH.py +++ b/num2words/lang_FR_CH.py @@ -24,9 +24,9 @@ class Num2Word_FR_CH(Num2Word_FR): Num2Word_FR.setup(self) self.mid_numwords = [(1000, "mille"), (100, "cent"), (90, "nonante"), - (80, "huitante"), (70, "septante"), (60, "soixante"), - (50, "cinquante"), (40, "quarante"), - (30, "trente")] + (80, "huitante"), (70, "septante"), + (60, "soixante"), (50, "cinquante"), + (40, "quarante"), (30, "trente")] def merge(self, curr, next): ctext, cnum, ntext, nnum = curr + next diff --git a/num2words/lang_ID.py b/num2words/lang_ID.py index 33ac85f..333b098 100644 --- a/num2words/lang_ID.py +++ b/num2words/lang_ID.py @@ -77,7 +77,9 @@ class Num2Word_ID(): def spell(self, blocks): """ it adds the list of spelling to the blocks - (('1',),('034',)) -> (('1',['satu']),('234',['tiga', 'puluh', 'empat'])) + ( + ('1',),('034',)) -> (('1',['satu']),('234',['tiga', 'puluh', 'empat']) + ) :param blocks: tuple :rtype: tuple """ @@ -91,7 +93,9 @@ class Num2Word_ID(): elif len(first_block[0]) == 2: spelling = self.puluh(first_block[0]) else: - spelling = self.ratus(first_block[0][0]) + self.puluh(first_block[0][1:3]) + spelling = ( + self.ratus(first_block[0][0]) + self.puluh(first_block[0][1:3]) + ) word_blocks += (first_block[0], spelling), @@ -123,7 +127,9 @@ class Num2Word_ID(): elif number[0] == '0': return self.BASE[int(number[1])] else: - return self.BASE[int(number[0])] + ['puluh'] + self.BASE[int(number[1])] + return ( + self.BASE[int(number[0])] + ['puluh'] + self.BASE[int(number[1])] + ) def spell_float(self, float_part): # spell the float number diff --git a/num2words/lang_LT.py b/num2words/lang_LT.py index bd1c03f..ed8f462 100644 --- a/num2words/lang_LT.py +++ b/num2words/lang_LT.py @@ -252,7 +252,8 @@ def to_currency(n, currency='EUR', cents=True): else: cents_str = "%02d" % right - return u'%s%s %s, %s %s' % (minus_str, int2word(left), pluralize(left, cr1), + return u'%s%s %s, %s %s' % (minus_str, int2word(left), + pluralize(left, cr1), cents_str, pluralize(right, cr2)) diff --git a/num2words/lang_NL.py b/num2words/lang_NL.py index 6895f64..ac01641 100644 --- a/num2words/lang_NL.py +++ b/num2words/lang_NL.py @@ -31,12 +31,22 @@ class Num2Word_NL(Num2Word_EU): self.negword = "min " self.pointword = "komma" # "Cannot treat float %s as ordinal." - self.errmsg_floatord = "Het zwevende puntnummer %s kan niet omgezet worden naar een ordernummer." + self.errmsg_floatord = ( + "Het zwevende puntnummer %s kan niet omgezet worden " + + "naar een ordernummer." + ) # "type(((type(%s)) ) not in [long, int, float]" - self.errmsg_nonnum = "Alleen nummers (type (%s)) kunnen naar woorden omgezet worden." + self.errmsg_nonnum = ( + "Alleen nummers (type (%s)) kunnen naar " + + "woorden omgezet worden." + ) # "Cannot treat negative num %s as ordinal." - self.errmsg_negord = "Het negatieve getal %s kan niet omgezet worden naar een ordernummer." - self.errmsg_toobig = "Het getal %s moet minder zijn dan %s." # "abs(%s) must be less than %s." + self.errmsg_negord = ( + "Het negatieve getal %s kan niet omgezet " + + "worden naar een ordernummer." + ) + # "abs(%s) must be less than %s." + self.errmsg_toobig = "Het getal %s moet minder zijn dan %s." self.exclude_title = [] lows = ["non", "okt", "sept", "sext", "quint", "quadr", "tr", "b", "m"] @@ -45,10 +55,13 @@ class Num2Word_NL(Num2Word_EU): tens = ["dez", "vigint", "trigint", "quadragint", "quinquagint", "sexagint", "septuagint", "oktogint", "nonagint"] - self.high_numwords = ["zend"] + self.gen_high_numwords(units, tens, lows) + self.high_numwords = ( + ["zend"] + self.gen_high_numwords(units, tens, lows) + ) self.mid_numwords = [(1000, "duizend"), (100, "honderd"), - (90, "negentig"), (80, "tachtig"), (70, "zeventig"), - (60, "zestig"), (50, "vijftig"), (40, "veertig"), + (90, "negentig"), (80, "tachtig"), + (70, "zeventig"), (60, "zestig"), + (50, "vijftig"), (40, "veertig"), (30, "dertig")] self.low_numwords = ["twintig", "negentien", "achttien", "zeventien", "zestien", "vijftien", "veertien", "dertien", @@ -138,9 +151,10 @@ to_ordnum = n2w.to_ordinal_num def main(): for val in [1, 7, 8, 12, 17, 62, 81, 91, 99, 100, 101, 102, 155, - 180, 300, 308, 832, 1000, 1001, 1061, 1062, 1100, 1500, 1701, 3000, - 8280, 8291, 150000, 500000, 3000000, 1000000, 2000001, 1000000000, 2000000000, - -21212121211221211111, -2.121212, -1.0000100]: + 180, 300, 308, 832, 1000, 1001, 1061, 1062, 1100, 1500, 1701, + 3000, 8280, 8291, 150000, 500000, 3000000, 1000000, 2000001, + 1000000000, 2000000000, -21212121211221211111, -2.121212, + -1.0000100]: n2w.test(val) n2w.test(3000000) diff --git a/num2words/lang_NO.py b/num2words/lang_NO.py index ba5df50..53e6026 100644 --- a/num2words/lang_NO.py +++ b/num2words/lang_NO.py @@ -111,8 +111,7 @@ def main(): 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) - n2w.test( - 1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) + n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) 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_SL.py b/num2words/lang_SL.py index 4de0a90..1b8119c 100644 --- a/num2words/lang_SL.py +++ b/num2words/lang_SL.py @@ -21,6 +21,7 @@ from __future__ import unicode_literals from .lang_EU import Num2Word_EU + class Num2Word_SL(Num2Word_EU): def set_high_numwords(self, high): max = 3 + 6*len(high) @@ -29,7 +30,6 @@ class Num2Word_SL(Num2Word_EU): self.cards[10**n] = word + "iljard" self.cards[10**(n-3)] = word + "iljon" - def setup(self): self.negword = "minus " self.pointword = "celih" @@ -37,30 +37,33 @@ class Num2Word_SL(Num2Word_EU): self.errmsg_toobig = "Number is too large to convert to words." self.exclude_title = [] - self.mid_numwords = [(1000, "tisoč"), (900, "devetsto"), (800, "osemsto"), - (700, "sedemsto"), (600, "šesto"), (500, "petsto"), (400, "štiristo"), (300, "tristo"), + self.mid_numwords = [(1000, "tisoč"), (900, "devetsto"), + (800, "osemsto"), (700, "sedemsto"), + (600, "šesto"), (500, "petsto"), + (400, "štiristo"), (300, "tristo"), (200, "dvesto"), (100, "sto"), - (90, "devetdeset"), (80, "osemdeset"), (70, "sedemdeset"), - (60, "šestdeset"), (50, "petdeset"), (40, "štirideset"), + (90, "devetdeset"), (80, "osemdeset"), + (70, "sedemdeset"), (60, "šestdeset"), + (50, "petdeset"), (40, "štirideset"), (30, "trideset")] - self.low_numwords = ["dvajset", "devetnajst", "osemnajst", "sedemnajst", - "šestnajst", "petnajst", "štirinajst", "trinajst", - "dvanajst", "enajst", "deset", "devet", "osem", "sedem", + self.low_numwords = ["dvajset", "devetnajst", "osemnajst", + "sedemnajst", "šestnajst", "petnajst", + "štirinajst", "trinajst", "dvanajst", + "enajst", "deset", "devet", "osem", "sedem", "šest", "pet", "štiri", "tri", "dve", "ena", "nič"] - self.ords = { "ena" : "prv", - "dve" : "drug", - "tri" : "tretj", - "štiri" : "četrt", - "sedem" : "sedm", - "osem" : "osm", - "sto" : "stot", - "tisoč" : "tisoč", - "miljon" : "miljont" + self.ords = {"ena": "prv", + "dve": "drug", + "tri": "tretj", + "štiri": "četrt", + "sedem": "sedm", + "osem": "osm", + "sto": "stot", + "tisoč": "tisoč", + "miljon": "miljont" } self.ordflag = False - def merge(self, curr, next): ctext, cnum, ntext, nnum = curr + next @@ -97,21 +100,20 @@ class Num2Word_SL(Num2Word_EU): else: ntext += "ov" - if nnum >= 10**2 and self.ordflag == False: + if nnum >= 10**2 and self.ordflag is False: ctext += " " val = cnum * nnum else: if nnum < 10 < cnum < 100: - ntext, ctext = ctext, ntext + "in" - elif cnum >= 10**2 and self.ordflag == False: + ntext, ctext = ctext, ntext + "in" + elif cnum >= 10**2 and self.ordflag is False: ctext += " " val = cnum + nnum word = ctext + ntext return (word, val) - def to_ordinal(self, value): self.verify_ordinal(value) self.ordflag = True @@ -123,27 +125,25 @@ class Num2Word_SL(Num2Word_EU): break return outword + "i" - # Is this correct?? def to_ordinal_num(self, value): self.verify_ordinal(value) return str(value) + "." - def to_currency(self, val, longval=True, old=False): if old: - return self.to_splitnum(val, hightxt="evro/a/v", lowtxt="stotin/a/i/ov", - jointxt="in",longval=longval) + return self.to_splitnum(val, hightxt="evro/a/v", + lowtxt="stotin/a/i/ov", + jointxt="in", longval=longval) return super(Num2Word_SL, self).to_currency(val, jointxt="in", longval=longval) def to_year(self, val, longval=True): - if not (val//100)%10: + if not (val//100) % 10: return self.to_cardinal(val) return self.to_splitnum(val, hightxt="hundert", longval=longval) - n2w = Num2Word_SL() to_card = n2w.to_cardinal to_ord = n2w.to_ordinal @@ -151,15 +151,16 @@ to_ordnum = n2w.to_ordinal_num def main(): - for val in [ 1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, - 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000, - 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, - -21212121211221211111, -2.121212, -1.0000100]: + for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, + 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000, + 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, + -21212121211221211111, -2.121212, -1.0000100]: n2w.test(val) n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) print(n2w.to_currency(112121)) print(n2w.to_year(2000)) + if __name__ == "__main__": main() diff --git a/num2words/lang_UK.py b/num2words/lang_UK.py index fcfe317..dcbaf8e 100644 --- a/num2words/lang_UK.py +++ b/num2words/lang_UK.py @@ -180,7 +180,8 @@ THOUSANDS = { CURRENCIES = { 'UAH': ( - (u'гривня', u'гривнi', u'гривень'), (u'копiйка', u'копiйки', u'копiйок') + (u'гривня', u'гривнi', u'гривень'), + (u'копiйка', u'копiйки', u'копiйок') ), 'EUR': ( (u'евро', u'евро', u'евро'), (u'цент', u'центи', u'центiв') @@ -205,8 +206,8 @@ 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 + # 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 % 10 == 1: form = 0 diff --git a/num2words/orderedmapping.py b/num2words/orderedmapping.py index dee8047..7481e7c 100644 --- a/num2words/orderedmapping.py +++ b/num2words/orderedmapping.py @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA + class OrderedMapping(dict): def __init__(self, *pairs): self.order = []