Fix as many pep8 issues as posible

Signed-off-by: William Moreno Reyes <williamjmorenor@gmail.com>
This commit is contained in:
William Moreno Reyes
2017-10-23 18:12:36 -06:00
parent e2ce7c2562
commit 94c73d277e
24 changed files with 375 additions and 341 deletions

View File

@@ -109,7 +109,8 @@ 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, "is", n2w.to_currency(val))
print(val, "is", n2w.to_year(val))

View File

@@ -30,9 +30,12 @@ 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." # "type(((type(%s)) ) not in [long, int, float]"
self.errmsg_negord = "Die negative Zahl %s kann nicht in eine Ordnungszahl konvertiert werden." # "Cannot treat negative num %s as ordinal."
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."
# "type(((type(%s)) ) not in [long, int, float]"
self.errmsg_negord = "Die negative Zahl %s kann nicht in eine Ordnungszahl 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.exclude_title = []
@@ -117,6 +120,7 @@ class Num2Word_DE(Num2Word_EU):
return self.to_cardinal(val)
return self.to_splitnum(val, hightxt="hundert", longval=longval)
n2w = Num2Word_DE()
to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal
@@ -139,6 +143,6 @@ def main():
print(n2w.to_year(1820))
print(n2w.to_year(2001))
if __name__ == "__main__":
main()

View File

@@ -92,7 +92,6 @@ class Num2Word_DK(lang_EU.Num2Word_EU):
word = ctext + ntext
return (word, val)
def to_ordinal(self, value):
self.verify_ordinal(value)
self.ordflag = True
@@ -117,7 +116,6 @@ class Num2Word_DK(lang_EU.Num2Word_EU):
return str(value) + "en"
return str(value) + "ende"
def to_currency(self, val, longval=True):
if val // 100 == 1 or val == 1:
ret = self.to_splitnum(val, hightxt="kr", lowtxt="\xf8re",
@@ -133,6 +131,7 @@ class Num2Word_DK(lang_EU.Num2Word_EU):
return self.to_cardinal(val)
return self.to_splitnum(val, hightxt="hundrede", longval=longval)
n2w = Num2Word_DK()
to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal
@@ -146,11 +145,13 @@ 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, 160, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]:
print(val, "er", n2w.to_currency(val))
print(val, "er", n2w.to_year(val))
n2w.test(65132)
if __name__ == "__main__":
main()

View File

@@ -47,7 +47,6 @@ class Num2Word_EN(lang_EU.Num2Word_EU):
"nine": "ninth",
"twelve": "twelfth"}
def merge(self, lpair, rpair):
ltext, lnum = lpair
rtext, rnum = rpair
@@ -61,7 +60,6 @@ class Num2Word_EN(lang_EU.Num2Word_EU):
return ("%s %s" % (ltext, rtext), lnum * rnum)
return ("%s, %s" % (ltext, rtext), lnum + rnum)
def to_ordinal(self, value):
self.verify_ordinal(value)
outwords = self.to_cardinal(value).split(" ")
@@ -77,12 +75,10 @@ class Num2Word_EN(lang_EU.Num2Word_EU):
outwords[-1] = "-".join(lastwords)
return " ".join(outwords)
def to_ordinal_num(self, value):
self.verify_ordinal(value)
return "%s%s" % (value, self.to_ordinal(value)[-2:])
def to_year(self, val, longval=True):
if not (val // 100) % 10:
return self.to_cardinal(val)
@@ -107,7 +103,8 @@ 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, "is", n2w.to_currency(val))
print(val, "is", n2w.to_year(val))

View File

@@ -17,6 +17,7 @@
from __future__ import unicode_literals, print_function
from .lang_EN import Num2Word_EN
class Num2Word_EN_EUR(Num2Word_EN):
def to_currency(self, val, longval=True, cents=True, jointxt="and"):
return self.to_splitnum(val, hightxt="euro/s", lowtxt="cents",
@@ -30,13 +31,15 @@ to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year
to_currency = n2w.to_currency
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]:
n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
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))

View File

@@ -30,13 +30,15 @@ to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year
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]:
n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
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))

View File

@@ -17,6 +17,7 @@
from __future__ import unicode_literals, print_function
from .lang_EN_GB import Num2Word_EN_GB
class Num2Word_EN_GB_old(Num2Word_EN_GB):
def base_setup(self):
sclass = super(Num2Word_EN_GB, self)
@@ -29,6 +30,7 @@ to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal
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,
@@ -36,10 +38,12 @@ def main():
-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, "is", n2w.to_currency(val))
print(val, "is", n2w.to_year(val))
if __name__ == "__main__":
main()

View File

@@ -17,6 +17,7 @@
from __future__ import unicode_literals
from .lang_EN import Num2Word_EN
class Num2Word_EN_IN(Num2Word_EN):
def set_high_numwords(self, high):
self.cards[10 ** 7] = "crore"
@@ -28,6 +29,7 @@ to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num
def main():
for val in (15000,
15 * 10 ** 5,
@@ -38,5 +40,6 @@ def main():
15 * 10 ** 10):
n2w.test(val)
if __name__ == "__main__":
main()

View File

@@ -21,7 +21,6 @@ from .lang_EU import Num2Word_EU
class Num2Word_ES(Num2Word_EU):
# //CHECK: Is this sufficient??
def set_high_numwords(self, high):
max = 3 + 6 * len(high)
@@ -170,10 +169,12 @@ def main():
-21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
print(n2w.to_currency(1222))
print(n2w.to_currency(1222, old=True))
print(n2w.to_year(1222))
if __name__ == "__main__":
main()

View File

@@ -17,6 +17,7 @@
from __future__ import unicode_literals
from .base import Num2Word_Base
class Num2Word_EU(Num2Word_Base):
def set_high_numwords(self, high):
max = 3 + 6 * len(high)
@@ -25,7 +26,6 @@ class Num2Word_EU(Num2Word_Base):
self.cards[10 ** n] = word + "illiard"
self.cards[10 ** (n - 3)] = word + "illion"
def base_setup(self):
lows = ["non", "oct", "sept", "sext", "quint", "quadr", "tr", "b", "m"]
units = ["", "un", "duo", "tre", "quattuor", "quin", "sex", "sept",
@@ -37,4 +37,3 @@ class Num2Word_EU(Num2Word_Base):
def to_currency(self, val, longval=True, jointxt=""):
return self.to_splitnum(val, hightxt="Euro/s", lowtxt="Euro cent/s",
jointxt=jointxt, longval=longval)

View File

@@ -41,7 +41,6 @@ class Num2Word_FR(Num2Word_EU):
"neuf": "neuvième",
}
def merge(self, curr, next):
ctext, cnum, ntext, nnum = curr + next
@@ -62,7 +61,6 @@ class Num2Word_FR(Num2Word_EU):
return ("%s %s" % (ctext, ntext), cnum * nnum)
return ("%s %s" % (ctext, ntext), cnum + nnum)
# Is this right for such things as 1001 - "mille unième" instead of
# "mille premier"?? "millième"??
@@ -94,11 +92,13 @@ class Num2Word_FR(Num2Word_EU):
return self.to_splitnum(val, hightxt=hightxt, lowtxt="centime/s",
jointxt="et", longval=longval)
n2w = Num2Word_FR()
to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal
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,
@@ -106,7 +106,8 @@ def main():
-21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
print(n2w.to_currency(112121))
print(n2w.to_year(1996))

View File

@@ -28,7 +28,6 @@ class Num2Word_FR_CH(Num2Word_FR):
(50, "cinquante"), (40, "quarante"),
(30, "trente")]
def merge(self, curr, next):
ctext, cnum, ntext, nnum = curr + next
@@ -53,6 +52,7 @@ to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal
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,
@@ -60,7 +60,8 @@ def main():
-21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
print(n2w.to_currency(112121))
print(n2w.to_year(1996))

View File

@@ -31,6 +31,7 @@ to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year
to_currency = n2w.to_currency
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,
@@ -38,7 +39,8 @@ def main():
-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, "is", n2w.to_currency(val))
print(val, "is", n2w.to_year(val))

View File

@@ -69,6 +69,7 @@ THOUSANDS = {
AND = u'ו'
def splitby3(n):
length = len(n)
if length > 3:
@@ -159,4 +160,3 @@ if __name__ == '__main__':
nums = [1, 11, 21, 24, 99, 100, 101, 200, 211, 345, 1000, 1011]
for num in nums:
print(num, yo.to_cardinal(num))

View File

@@ -16,8 +16,8 @@
from __future__ import unicode_literals, print_function
class Num2Word_ID():
class Num2Word_ID():
BASE = {0: [],
1: ["satu"],
2: ["dua"],

View File

@@ -42,6 +42,7 @@ EXPONENT_PREFIXES = [
ZERO, "m", "b", "tr", "quadr", "quint", "sest", "sett", "ott", "nov", "dec"
]
# Utils
# =====
@@ -53,6 +54,7 @@ def phonetic_contraction(string):
.replace("au", "u") # ex. "trentauno"
)
def exponent_length_to_string(exponent_length):
# We always assume `exponent` to be a multiple of 3. If it's not true, then
# Num2Word_IT.big_number_to_cardinal did something wrong.
@@ -62,6 +64,7 @@ def exponent_length_to_string(exponent_length):
else:
return prefix + "iliardo"
def accentuate(string):
# This is inefficient: it may do several rewritings when deleting
# half-sentence accents. However, it is the easiest method and speed is
@@ -78,14 +81,15 @@ def accentuate(string):
for w in string.split()
])
def omitt_if_zero(number_to_string):
return "" if number_to_string == ZERO else number_to_string
# Main class
# ==========
class Num2Word_IT:
MINUS_PREFIX_WORD = "meno "
FLOAT_INFIX_WORD = " virgola "

View File

@@ -153,6 +153,7 @@ CURRENCIES = {
'EUR': ((u'euras', u'eurai', u'eurų'), (u'centas', u'centai', u'centų')),
}
def splitby3(n):
length = len(n)
if length > 3:
@@ -168,6 +169,7 @@ def splitby3(n):
def get_digits(n):
return [int(x) for x in reversed(list(('%03d' % n)[-3:]))]
def pluralize(n, forms):
n1, n2, n3 = get_digits(n)
if n2 == 1 or n1 == 0 or n == 0:
@@ -177,6 +179,7 @@ def pluralize(n, forms):
else:
return forms[1]
def int2word(n):
if n == 0:
return ZERO[0]
@@ -209,6 +212,7 @@ def int2word(n):
return ' '.join(words)
def n2w(n):
n = str(n).replace(',', '.')
if '.' in n:
@@ -217,6 +221,7 @@ def n2w(n):
else:
return int2word(int(n))
def to_currency(n, currency='EUR', cents=True):
if type(n) == int:
if n < 0:
@@ -250,6 +255,7 @@ def to_currency(n, currency='EUR', cents = True):
return u'%s%s %s, %s %s' % (minus_str, int2word(left), pluralize(left, cr1),
cents_str, pluralize(right, cr2))
class Num2Word_LT(object):
def to_cardinal(self, number):
return n2w(number)
@@ -257,6 +263,8 @@ class Num2Word_LT(object):
def to_ordinal(self, number):
raise NotImplementedError()
if __name__ == '__main__':
import doctest
doctest.testmod()

View File

@@ -30,9 +30,12 @@ class Num2Word_NL(Num2Word_EU):
def setup(self):
self.negword = "min "
self.pointword = "komma"
self.errmsg_floatord = "Het zwevende puntnummer %s kan niet omgezet worden naar een ordernummer." # "Cannot treat float %s as ordinal."
self.errmsg_nonnum = "Alleen nummers (type (%s)) kunnen naar woorden omgezet worden." # "type(((type(%s)) ) not in [long, int, float]"
self.errmsg_negord = "Het negatieve getal %s kan niet omgezet worden naar een ordernummer." # "Cannot treat negative num %s as ordinal."
# "Cannot treat float %s as ordinal."
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."
# "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.exclude_title = []
@@ -42,9 +45,6 @@ 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.mid_numwords = [(1000, "duizend"), (100, "honderd"),
(90, "negentig"), (80, "tachtig"), (70, "zeventig"),
@@ -129,6 +129,7 @@ class Num2Word_NL(Num2Word_EU):
return self.to_cardinal(val)
return self.to_splitnum(val, hightxt="honderd", longval=longval)
n2w = Num2Word_NL()
to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal
@@ -150,6 +151,6 @@ def main():
print(n2w.to_year(1820))
print(n2w.to_year(2001))
if __name__ == "__main__":
main()

View File

@@ -17,6 +17,7 @@
from __future__ import division, unicode_literals, print_function
from . import lang_EU
class Num2Word_NO(lang_EU.Num2Word_EU):
def set_high_numwords(self, high):
max = 3 + 6 * len(high)
@@ -53,7 +54,6 @@ class Num2Word_NO(lang_EU.Num2Word_EU):
"tolv": "tolvte",
"tjue": "tjuende"}
def merge(self, lpair, rpair):
ltext, lnum = lpair
rtext, rnum = rpair
@@ -67,7 +67,6 @@ class Num2Word_NO(lang_EU.Num2Word_EU):
return ("%s %s" % (ltext, rtext), lnum * rnum)
return ("%s, %s" % (ltext, rtext), lnum + rnum)
def to_ordinal(self, value):
self.verify_ordinal(value)
outwords = self.to_cardinal(value).split(" ")
@@ -84,12 +83,10 @@ class Num2Word_NO(lang_EU.Num2Word_EU):
outwords[-1] = "".join(lastwords)
return " ".join(outwords)
def to_ordinal_num(self, value):
self.verify_ordinal(value)
return "%s%s" % (value, self.to_ordinal(value)[-2:])
def to_year(self, val, longval=True):
if not (val // 100) % 10:
return self.to_cardinal(val)
@@ -107,13 +104,15 @@ to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year
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]:
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))

View File

@@ -287,4 +287,5 @@ class Num2Word_PL(object):
if __name__ == '__main__':
import doctest
doctest.testmod()

View File

@@ -309,4 +309,5 @@ class Num2Word_RU(object):
if __name__ == '__main__':
import doctest
doctest.testmod()

View File

@@ -541,7 +541,8 @@ class Num2Word_TR(object):
if not int(val) == 0:
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
elif len(self.integers_to_read[0]) % 3 == 0:

View File

@@ -247,7 +247,6 @@ def int2word(n, feminine=True):
ones = ONES_FEMININE if i == 1 or feminine and i == 0 else ONES
words.append(ones[n1][0])
if i > 0 and ((n1 + n2 + n3) > 0):
words.append(pluralize(x, THOUSANDS[i]))
@@ -314,4 +313,5 @@ class Num2Word_UK(object):
if __name__ == '__main__':
import doctest
doctest.testmod()