Merge pull request #98 from williamjmorenor/master

Fix some pep8 issues
This commit is contained in:
Ernesto Rodriguez Ortiz
2017-10-26 15:03:27 -04:00
committed by GitHub
30 changed files with 519 additions and 446 deletions

View File

@@ -1,2 +1,3 @@
include CHANGES.rst include CHANGES.rst
include COPYING include COPYING
include tests/*

View File

@@ -72,6 +72,7 @@ CONVERTER_CLASSES = {
'uk': lang_UK.Num2Word_UK() 'uk': lang_UK.Num2Word_UK()
} }
CONVERTES_TYPES = ['cardinal', 'ordinal', 'year', 'currency'] CONVERTES_TYPES = ['cardinal', 'ordinal', 'year', 'currency']

View File

@@ -41,29 +41,24 @@ class Num2Word_Base(object):
self.MAXVAL = 1000 * self.cards.order[0] self.MAXVAL = 1000 * self.cards.order[0]
def set_numwords(self): def set_numwords(self):
self.set_high_numwords(self.high_numwords) self.set_high_numwords(self.high_numwords)
self.set_mid_numwords(self.mid_numwords) self.set_mid_numwords(self.mid_numwords)
self.set_low_numwords(self.low_numwords) self.set_low_numwords(self.low_numwords)
def gen_high_numwords(self, units, tens, lows): def gen_high_numwords(self, units, tens, lows):
out = [u + t for t in tens for u in units] out = [u + t for t in tens for u in units]
out.reverse() out.reverse()
return out + lows return out + lows
def set_mid_numwords(self, mid): def set_mid_numwords(self, mid):
for key, val in mid: for key, val in mid:
self.cards[key] = val self.cards[key] = val
def set_low_numwords(self, numwords): def set_low_numwords(self, numwords):
for word, n in zip(numwords, range(len(numwords) - 1, -1, -1)): for word, n in zip(numwords, range(len(numwords) - 1, -1, -1)):
self.cards[n] = word self.cards[n] = word
def splitnum(self, value): def splitnum(self, value):
for elem in self.cards: for elem in self.cards:
if elem > value: if elem > value:
@@ -89,7 +84,6 @@ class Num2Word_Base(object):
return out return out
def to_cardinal(self, value): def to_cardinal(self, value):
try: try:
assert int(value) == value assert int(value) == value
@@ -110,21 +104,20 @@ class Num2Word_Base(object):
words, num = self.clean(val) words, num = self.clean(val)
return self.title(out + words) return self.title(out + words)
def float2tuple(self, value): def float2tuple(self, value):
pre = int(value) pre = int(value)
post = abs(value - pre) * 10**self.precision post = abs(value - pre) * 10**self.precision
if abs(round(post) - post) < 0.01: if abs(round(post) - post) < 0.01:
# We generally floor all values beyond our precision (rather than rounding), but in # We generally floor all values beyond our precision (rather than
# cases where we have something like 1.239999999, which is probably due to python's # rounding), but in cases where we have something like 1.239999999,
# handling of floats, we actually want to consider it as 1.24 instead of 1.23 # which is probably due to python's handling of floats, we actually
# want to consider it as 1.24 instead of 1.23
post = int(round(post)) post = int(round(post))
else: else:
post = int(math.floor(post)) post = int(math.floor(post))
return pre, post return pre, post
def to_cardinal_float(self, value): def to_cardinal_float(self, value):
try: try:
float(value) == value float(value) == value
@@ -146,11 +139,9 @@ class Num2Word_Base(object):
return " ".join(out) return " ".join(out)
def merge(self, curr, next): def merge(self, curr, next):
raise NotImplementedError raise NotImplementedError
def clean(self, val): def clean(self, val):
out = val out = val
while len(val) != 1: while len(val) != 1:
@@ -172,7 +163,6 @@ class Num2Word_Base(object):
val = out val = out
return out[0] return out[0]
def title(self, value): def title(self, value):
if self.is_title: if self.is_title:
out = [] out = []
@@ -185,30 +175,24 @@ class Num2Word_Base(object):
value = " ".join(out) value = " ".join(out)
return value return value
def verify_ordinal(self, value): def verify_ordinal(self, value):
if not value == int(value): if not value == int(value):
raise TypeError(self.errmsg_floatord % value) raise TypeError(self.errmsg_floatord % value)
if not abs(value) == value: if not abs(value) == value:
raise TypeError(self.errmsg_negord % value) raise TypeError(self.errmsg_negord % value)
def verify_num(self, value): def verify_num(self, value):
return 1 return 1
def set_wordnums(self): def set_wordnums(self):
pass pass
def to_ordinal(self, value): def to_ordinal(self, value):
return self.to_cardinal(value) return self.to_cardinal(value)
def to_ordinal_num(self, value): def to_ordinal_num(self, value):
return value return value
# Trivial version # Trivial version
def inflect(self, value, text): def inflect(self, value, text):
text = text.split("/") text = text.split("/")
@@ -216,7 +200,6 @@ class Num2Word_Base(object):
return text[0] return text[0]
return "".join(text) return "".join(text)
# //CHECK: generalise? Any others like pounds/shillings/pence? # //CHECK: generalise? Any others like pounds/shillings/pence?
def to_splitnum(self, val, hightxt="", lowtxt="", jointxt="", def to_splitnum(self, val, hightxt="", lowtxt="", jointxt="",
divisor=100, longval=True, cents=True): divisor=100, longval=True, cents=True):
@@ -252,23 +235,18 @@ class Num2Word_Base(object):
return " ".join(out) return " ".join(out)
def to_year(self, value, **kwargs): def to_year(self, value, **kwargs):
return self.to_cardinal(value) return self.to_cardinal(value)
def to_currency(self, value, **kwargs): def to_currency(self, value, **kwargs):
return self.to_cardinal(value) return self.to_cardinal(value)
def base_setup(self): def base_setup(self):
pass pass
def setup(self): def setup(self):
pass pass
def test(self, value): def test(self, value):
try: try:
_card = self.to_cardinal(value) _card = self.to_cardinal(value)
@@ -285,5 +263,5 @@ class Num2Word_Base(object):
except: except:
_ordnum = "invalid" _ordnum = "invalid"
print ("For %s, card is %s;\n\tord is %s; and\n\tordnum is %s." % print("For %s, card is %s;\n\tord is %s; and\n\tordnum is %s."
(value, _card, _ord, _ordnum)) % (value, _card, _ord, _ordnum))

View File

@@ -18,9 +18,9 @@ import sys
PY3 = sys.version_info[0] == 3 PY3 = sys.version_info[0] == 3
def to_s(val): def to_s(val):
if PY3: if PY3:
return str(val) return str(val)
else: else:
return unicode(val) return unicode(val)

View File

@@ -18,6 +18,7 @@
from __future__ import division, unicode_literals, print_function from __future__ import division, unicode_literals, print_function
from . import lang_EU from . import lang_EU
class Num2Word_AR(lang_EU.Num2Word_EU): class Num2Word_AR(lang_EU.Num2Word_EU):
def set_high_numwords(self, high): def set_high_numwords(self, high):
max = 3 + 3 * len(high) max = 3 + 3 * len(high)
@@ -48,7 +49,6 @@ class Num2Word_AR(lang_EU.Num2Word_EU):
"تسعة": "تاسع", "تسعة": "تاسع",
"اثناعشر": "ثاني عشر"} "اثناعشر": "ثاني عشر"}
def merge(self, lpair, rpair): def merge(self, lpair, rpair):
ltext, lnum = lpair ltext, lnum = lpair
rtext, rnum = rpair rtext, rnum = rpair
@@ -68,7 +68,6 @@ class Num2Word_AR(lang_EU.Num2Word_EU):
return ("%s %s" % (ltext, rtext), lnum * rnum) return ("%s %s" % (ltext, rtext), lnum * rnum)
return ("%s، %s" % (ltext, rtext), lnum + rnum) return ("%s، %s" % (ltext, rtext), lnum + rnum)
def to_ordinal(self, value): def to_ordinal(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
outwords = self.to_cardinal(value).split(" ") outwords = self.to_cardinal(value).split(" ")
@@ -82,12 +81,10 @@ class Num2Word_AR(lang_EU.Num2Word_EU):
outwords[-1] = "،".join(lastwords) outwords[-1] = "،".join(lastwords)
return " ".join(outwords) return " ".join(outwords)
def to_ordinal_num(self, value): def to_ordinal_num(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
return "%s%s" % (value, self.to_ordinal(value)[-2:]) return "%s%s" % (value, self.to_ordinal(value)[-2:])
def to_year(self, val, longval=True): 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_cardinal(val)
@@ -105,6 +102,7 @@ to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year to_year = n2w.to_year
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,

View File

@@ -18,6 +18,7 @@
from __future__ import unicode_literals, print_function from __future__ import unicode_literals, print_function
from .lang_EU import Num2Word_EU from .lang_EU import Num2Word_EU
class Num2Word_DE(Num2Word_EU): class Num2Word_DE(Num2Word_EU):
def set_high_numwords(self, high): def set_high_numwords(self, high):
max = 3 + 6 * len(high) max = 3 + 6 * len(high)
@@ -29,10 +30,22 @@ class Num2Word_DE(Num2Word_EU):
def setup(self): def setup(self):
self.negword = "minus " self.negword = "minus "
self.pointword = "Komma" self.pointword = "Komma"
self.errmsg_floatord = "Die Gleitkommazahl %s kann nicht in eine Ordnungszahl konvertiert werden." # "Cannot treat float %s as ordinal." # "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_floatord = (
self.errmsg_negord = "Die negative Zahl %s kann nicht in eine Ordnungszahl konvertiert werden." # "Cannot treat negative num %s as ordinal." "Die Gleitkommazahl %s kann nicht in eine Ordnungszahl " +
self.errmsg_toobig = "Die Zahl %s muss kleiner als %s sein." # "abs(%s) must be less than %s." "konvertiert werden."
)
# "type(((type(%s)) ) not in [long, int, float]"
self.errmsg_nonnum = (
"Nur Zahlen (type(%s)) können in Wörter konvertiert werden."
)
# "Cannot treat negative num %s as ordinal."
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 = [] self.exclude_title = []
lows = ["non", "okt", "sept", "sext", "quint", "quadr", "tr", "b", "m"] lows = ["non", "okt", "sept", "sext", "quint", "quadr", "tr", "b", "m"]
@@ -40,16 +53,18 @@ class Num2Word_DE(Num2Word_EU):
"okto", "novem"] "okto", "novem"]
tens = ["dez", "vigint", "trigint", "quadragint", "quinquagint", tens = ["dez", "vigint", "trigint", "quadragint", "quinquagint",
"sexagint", "septuagint", "oktogint", "nonagint"] "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"), self.mid_numwords = [(1000, "tausend"), (100, "hundert"),
(90, "neunzig"), (80, "achtzig"), (70, "siebzig"), (90, "neunzig"), (80, "achtzig"), (70, "siebzig"),
(60, "sechzig"), (50, "f\xFCnfzig"), (40, "vierzig"), (60, "sechzig"), (50, "f\xFCnfzig"),
(30, "drei\xDFig")] (40, "vierzig"), (30, "drei\xDFig")]
self.low_numwords = ["zwanzig", "neunzehn", "achtzehn", "siebzehn", self.low_numwords = ["zwanzig", "neunzehn", "achtzehn", "siebzehn",
"sechzehn", "f\xFCnfzehn", "vierzehn", "dreizehn", "sechzehn", "f\xFCnfzehn", "vierzehn", "dreizehn",
"zw\xF6lf", "elf", "zehn", "neun", "acht", "sieben", "zw\xF6lf", "elf", "zehn", "neun", "acht",
"sechs", "f\xFCnf", "vier", "drei", "zwei", "eins", "sieben", "sechs", "f\xFCnf", "vier", "drei",
"null"] "zwei", "eins", "null"]
self.ords = {"eins": "ers", self.ords = {"eins": "ers",
"drei": "drit", "drei": "drit",
"acht": "ach", "acht": "ach",
@@ -116,6 +131,7 @@ class Num2Word_DE(Num2Word_EU):
return self.to_cardinal(val) return self.to_cardinal(val)
return self.to_splitnum(val, hightxt="hundert", longval=longval) return self.to_splitnum(val, hightxt="hundert", longval=longval)
n2w = Num2Word_DE() n2w = Num2Word_DE()
to_card = n2w.to_cardinal to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal to_ord = n2w.to_ordinal
@@ -138,6 +154,6 @@ def main():
print(n2w.to_year(1820)) print(n2w.to_year(1820))
print(n2w.to_year(2001)) print(n2w.to_year(2001))
if __name__ == "__main__": if __name__ == "__main__":
main() main()

View File

@@ -17,6 +17,7 @@
from __future__ import division, unicode_literals, print_function from __future__ import division, unicode_literals, print_function
from . import lang_EU from . import lang_EU
class Num2Word_DK(lang_EU.Num2Word_EU): class Num2Word_DK(lang_EU.Num2Word_EU):
def set_high_numwords(self, high): def set_high_numwords(self, high):
max = 3 + 6 * len(high) max = 3 + 6 * len(high)
@@ -31,9 +32,9 @@ class Num2Word_DK(lang_EU.Num2Word_EU):
self.exclude_title = ["og", "komma", "minus"] self.exclude_title = ["og", "komma", "minus"]
self.mid_numwords = [(1000, "tusind"), (100, "hundrede"), self.mid_numwords = [(1000, "tusind"), (100, "hundrede"),
(90, "halvfems"), (80, "firs"), (70, "halvfjerds"), (90, "halvfems"), (80, "firs"),
(60, "treds"), (50, "halvtreds"), (40, "fyrre"), (70, "halvfjerds"), (60, "treds"),
(30, "tredive")] (50, "halvtreds"), (40, "fyrre"), (30, "tredive")]
self.low_numwords = ["tyve", "nitten", "atten", "sytten", self.low_numwords = ["tyve", "nitten", "atten", "sytten",
"seksten", "femten", "fjorten", "tretten", "seksten", "femten", "fjorten", "tretten",
"tolv", "elleve", "ti", "ni", "otte", "tolv", "elleve", "ti", "ni", "otte",
@@ -91,7 +92,6 @@ class Num2Word_DK(lang_EU.Num2Word_EU):
word = ctext + ntext word = ctext + ntext
return (word, val) return (word, val)
def to_ordinal(self, value): def to_ordinal(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
self.ordflag = True self.ordflag = True
@@ -116,7 +116,6 @@ class Num2Word_DK(lang_EU.Num2Word_EU):
return str(value) + "en" return str(value) + "en"
return str(value) + "ende" return str(value) + "ende"
def to_currency(self, val, longval=True): def to_currency(self, val, longval=True):
if val // 100 == 1 or val == 1: if val // 100 == 1 or val == 1:
ret = self.to_splitnum(val, hightxt="kr", lowtxt="\xf8re", ret = self.to_splitnum(val, hightxt="kr", lowtxt="\xf8re",
@@ -132,23 +131,27 @@ class Num2Word_DK(lang_EU.Num2Word_EU):
return self.to_cardinal(val) return self.to_cardinal(val)
return self.to_splitnum(val, hightxt="hundrede", longval=longval) return self.to_splitnum(val, hightxt="hundrede", longval=longval)
n2w = Num2Word_DK() n2w = Num2Word_DK()
to_card = n2w.to_cardinal to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year to_year = n2w.to_year
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
-21212121211221211111, -2.121212, -1.0000100]: -21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
for val in [1, 120, 160, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: 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_currency(val))
print(val, "er", n2w.to_year(val)) print(val, "er", n2w.to_year(val))
n2w.test(65132) n2w.test(65132)
if __name__ == "__main__": if __name__ == "__main__":
main() main()

View File

@@ -17,6 +17,7 @@
from __future__ import division, unicode_literals, print_function from __future__ import division, unicode_literals, print_function
from . import lang_EU from . import lang_EU
class Num2Word_EN(lang_EU.Num2Word_EU): class Num2Word_EN(lang_EU.Num2Word_EU):
def set_high_numwords(self, high): def set_high_numwords(self, high):
max = 3 + 3 * len(high) max = 3 + 3 * len(high)
@@ -46,7 +47,6 @@ class Num2Word_EN(lang_EU.Num2Word_EU):
"nine": "ninth", "nine": "ninth",
"twelve": "twelfth"} "twelve": "twelfth"}
def merge(self, lpair, rpair): def merge(self, lpair, rpair):
ltext, lnum = lpair ltext, lnum = lpair
rtext, rnum = rpair rtext, rnum = rpair
@@ -60,7 +60,6 @@ class Num2Word_EN(lang_EU.Num2Word_EU):
return ("%s %s" % (ltext, rtext), lnum * rnum) return ("%s %s" % (ltext, rtext), lnum * rnum)
return ("%s, %s" % (ltext, rtext), lnum + rnum) return ("%s, %s" % (ltext, rtext), lnum + rnum)
def to_ordinal(self, value): def to_ordinal(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
outwords = self.to_cardinal(value).split(" ") outwords = self.to_cardinal(value).split(" ")
@@ -76,12 +75,10 @@ class Num2Word_EN(lang_EU.Num2Word_EU):
outwords[-1] = "-".join(lastwords) outwords[-1] = "-".join(lastwords)
return " ".join(outwords) return " ".join(outwords)
def to_ordinal_num(self, value): def to_ordinal_num(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
return "%s%s" % (value, self.to_ordinal(value)[-2:]) return "%s%s" % (value, self.to_ordinal(value)[-2:])
def to_year(self, val, longval=True): 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_cardinal(val)
@@ -99,13 +96,15 @@ to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year to_year = n2w.to_year
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
-21212121211221211111, -2.121212, -1.0000100]: -21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: 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_currency(val))
print(val, "is", n2w.to_year(val)) print(val, "is", n2w.to_year(val))

View File

@@ -14,9 +14,10 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA # MA 02110-1301 USA
from __future__ import unicode_literals from __future__ import unicode_literals, print_function
from .lang_EN import Num2Word_EN from .lang_EN import Num2Word_EN
class Num2Word_EN_EUR(Num2Word_EN): class Num2Word_EN_EUR(Num2Word_EN):
def to_currency(self, val, longval=True, cents=True, jointxt="and"): def to_currency(self, val, longval=True, cents=True, jointxt="and"):
return self.to_splitnum(val, hightxt="euro/s", lowtxt="cents", return self.to_splitnum(val, hightxt="euro/s", lowtxt="cents",
@@ -30,16 +31,18 @@ to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year to_year = n2w.to_year
to_currency = n2w.to_currency to_currency = n2w.to_currency
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
-21212121211221211111, -2.121212, -1.0000100]: -21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: 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_currency(val))
print val, "is", n2w.to_year(val) print(val, "is", n2w.to_year(val))
if __name__ == "__main__": if __name__ == "__main__":

View File

@@ -30,13 +30,15 @@ to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year to_year = n2w.to_year
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001, 8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
-21212121211221211111, -2.121212, -1.0000100]: -21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: 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_currency(val))
print(val, "is", n2w.to_year(val)) print(val, "is", n2w.to_year(val))

View File

@@ -14,9 +14,10 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA # MA 02110-1301 USA
from __future__ import unicode_literals from __future__ import unicode_literals, print_function
from .lang_EN_GB import Num2Word_EN_GB from .lang_EN_GB import Num2Word_EN_GB
class Num2Word_EN_GB_old(Num2Word_EN_GB): class Num2Word_EN_GB_old(Num2Word_EN_GB):
def base_setup(self): def base_setup(self):
sclass = super(Num2Word_EN_GB, self) sclass = super(Num2Word_EN_GB, self)
@@ -29,6 +30,7 @@ to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num to_ordnum = n2w.to_ordinal_num
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
@@ -36,10 +38,12 @@ def main():
-21212121211221211111, -2.121212, -1.0000100]: -21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: 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_currency(val))
print val, "is", n2w.to_year(val) print(val, "is", n2w.to_year(val))
if __name__ == "__main__": if __name__ == "__main__":
main() main()

View File

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

View File

@@ -21,7 +21,6 @@ from .lang_EU import Num2Word_EU
class Num2Word_ES(Num2Word_EU): class Num2Word_ES(Num2Word_EU):
# //CHECK: Is this sufficient?? # //CHECK: Is this sufficient??
def set_high_numwords(self, high): def set_high_numwords(self, high):
max = 3 + 6 * len(high) max = 3 + 6 * len(high)
@@ -35,12 +34,15 @@ class Num2Word_ES(Num2Word_EU):
self.negword = "menos " self.negword = "menos "
self.pointword = "punto" self.pointword = "punto"
self.errmsg_nonnum = "Solo números pueden ser convertidos a palabras." 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.gender_stem = "o"
self.exclude_title = ["y", "menos", "punto"] self.exclude_title = ["y", "menos", "punto"]
self.mid_numwords = [(1000, "mil"), (100, "cien"), (90, "noventa"), self.mid_numwords = [(1000, "mil"), (100, "cien"), (90, "noventa"),
(80, "ochenta"), (70, "setenta"), (60, "sesenta"), (80, "ochenta"), (70, "setenta"), (60, "sesenta"),
(50, "cincuenta"), (40, "cuarenta"), (30, "treinta")] (50, "cincuenta"), (40, "cuarenta"),
(30, "treinta")]
self.low_numwords = ["veintinueve", "veintiocho", "veintisiete", self.low_numwords = ["veintinueve", "veintiocho", "veintisiete",
"veintiséis", "veinticinco", "veinticuatro", "veintiséis", "veinticinco", "veinticuatro",
"veintitrés", "veintidós", "veintiuno", "veintitrés", "veintidós", "veintiuno",
@@ -121,13 +123,22 @@ class Num2Word_ES(Num2Word_EU):
elif value <= 10: elif value <= 10:
text = "%s%s" % (self.ords[value], self.gender_stem) text = "%s%s" % (self.ords[value], self.gender_stem)
elif value <= 12: 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: elif value <= 100:
dec = (value // 10) * 10 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: elif value <= 1e3:
cen = (value // 100) * 100 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: elif value < 1e18:
# dec contains the following: # dec contains the following:
# [ 1e3, 1e6): 1e3 # [ 1e3, 1e6): 1e3
@@ -137,8 +148,13 @@ class Num2Word_ES(Num2Word_EU):
# [1e15, 1e18): 1e15 # [1e15, 1e18): 1e15
dec = 10 ** ((((len(str(int(value))) - 1) / 3 - 1) + 1) * 3) dec = 10 ** ((((len(str(int(value))) - 1) / 3 - 1) + 1) * 3)
part = int(float(value / dec) * dec) part = int(float(value / dec) * dec)
cardinal = self.to_cardinal(part / dec) if part / dec != 1 else "" cardinal = (
text = "%s%s%s %s" % (cardinal, self.ords[dec], self.gender_stem, self.to_ordinal(value - part)) 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: else:
text = self.to_cardinal(value) text = self.to_cardinal(value)
except KeyError: except KeyError:
@@ -170,10 +186,12 @@ def main():
-21212121211221211111, -2.121212, -1.0000100]: -21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
print(n2w.to_currency(1222)) print(n2w.to_currency(1222))
print(n2w.to_currency(1222, old=True)) print(n2w.to_currency(1222, old=True))
print(n2w.to_year(1222)) print(n2w.to_year(1222))
if __name__ == "__main__": if __name__ == "__main__":
main() main()

View File

@@ -23,9 +23,11 @@ from .lang_ES import Num2Word_ES
class Num2Word_ES_VE(Num2Word_ES): class Num2Word_ES_VE(Num2Word_ES):
def to_currency(self, val, longval=True, old=False): 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) divisor=1000, jointxt="y", longval=longval)
n2w = Num2Word_ES_VE() n2w = Num2Word_ES_VE()
to_card = n2w.to_cardinal to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal to_ord = n2w.to_ordinal

View File

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

View File

@@ -25,7 +25,9 @@ class Num2Word_FR(Num2Word_EU):
self.negword = "moins " self.negword = "moins "
self.pointword = "virgule" 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.errmsg_toobig = u"Nombre trop grand pour être converti en mots."
self.exclude_title = ["et", "virgule", "moins"] self.exclude_title = ["et", "virgule", "moins"]
self.mid_numwords = [(1000, "mille"), (100, "cent"), self.mid_numwords = [(1000, "mille"), (100, "cent"),
@@ -41,7 +43,6 @@ class Num2Word_FR(Num2Word_EU):
"neuf": "neuvième", "neuf": "neuvième",
} }
def merge(self, curr, next): def merge(self, curr, next):
ctext, cnum, ntext, nnum = curr + next ctext, cnum, ntext, nnum = curr + next
@@ -62,7 +63,6 @@ class Num2Word_FR(Num2Word_EU):
return ("%s %s" % (ctext, ntext), cnum * nnum) return ("%s %s" % (ctext, ntext), cnum * nnum)
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 # Is this right for such things as 1001 - "mille unième" instead of
# "mille premier"?? "millième"?? # "mille premier"?? "millième"??
@@ -94,11 +94,13 @@ class Num2Word_FR(Num2Word_EU):
return self.to_splitnum(val, hightxt=hightxt, lowtxt="centime/s", return self.to_splitnum(val, hightxt=hightxt, lowtxt="centime/s",
jointxt="et", longval=longval) jointxt="et", longval=longval)
n2w = Num2Word_FR() n2w = Num2Word_FR()
to_card = n2w.to_cardinal to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num to_ordnum = n2w.to_ordinal_num
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
@@ -106,7 +108,8 @@ def main():
-21212121211221211111, -2.121212, -1.0000100]: -21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
print(n2w.to_currency(112121)) print(n2w.to_currency(112121))
print(n2w.to_year(1996)) print(n2w.to_year(1996))

View File

@@ -24,10 +24,9 @@ class Num2Word_FR_CH(Num2Word_FR):
Num2Word_FR.setup(self) Num2Word_FR.setup(self)
self.mid_numwords = [(1000, "mille"), (100, "cent"), (90, "nonante"), self.mid_numwords = [(1000, "mille"), (100, "cent"), (90, "nonante"),
(80, "huitante"), (70, "septante"), (60, "soixante"), (80, "huitante"), (70, "septante"),
(50, "cinquante"), (40, "quarante"), (60, "soixante"), (50, "cinquante"),
(30, "trente")] (40, "quarante"), (30, "trente")]
def merge(self, curr, next): def merge(self, curr, next):
ctext, cnum, ntext, nnum = curr + next ctext, cnum, ntext, nnum = curr + next
@@ -53,6 +52,7 @@ to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num to_ordnum = n2w.to_ordinal_num
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
@@ -60,7 +60,8 @@ def main():
-21212121211221211111, -2.121212, -1.0000100]: -21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
print(n2w.to_currency(112121)) print(n2w.to_currency(112121))
print(n2w.to_year(1996)) print(n2w.to_year(1996))

View File

@@ -31,6 +31,7 @@ to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year to_year = n2w.to_year
to_currency = n2w.to_currency to_currency = n2w.to_currency
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
@@ -38,7 +39,8 @@ def main():
-21212121211221211111, -2.121212, -1.0000100]: -21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730) n2w.test(
1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
for val in [1, 120, 1000, 1120, 1800, 1976, 2000, 2010, 2099, 2171]: 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_currency(val))
print(val, "is", n2w.to_year(val)) print(val, "is", n2w.to_year(val))

View File

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

View File

@@ -16,8 +16,8 @@
from __future__ import unicode_literals, print_function from __future__ import unicode_literals, print_function
class Num2Word_ID():
class Num2Word_ID():
BASE = {0: [], BASE = {0: [],
1: ["satu"], 1: ["satu"],
2: ["dua"], 2: ["dua"],
@@ -77,7 +77,9 @@ class Num2Word_ID():
def spell(self, blocks): def spell(self, blocks):
""" """
it adds the list of spelling to the 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 :param blocks: tuple
:rtype: tuple :rtype: tuple
""" """
@@ -91,7 +93,9 @@ class Num2Word_ID():
elif len(first_block[0]) == 2: elif len(first_block[0]) == 2:
spelling = self.puluh(first_block[0]) spelling = self.puluh(first_block[0])
else: 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), word_blocks += (first_block[0], spelling),
@@ -123,7 +127,9 @@ class Num2Word_ID():
elif number[0] == '0': elif number[0] == '0':
return self.BASE[int(number[1])] return self.BASE[int(number[1])]
else: 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): def spell_float(self, float_part):
# spell the float number # spell the float number

View File

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

View File

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

View File

@@ -18,6 +18,7 @@
from __future__ import unicode_literals, print_function from __future__ import unicode_literals, print_function
from .lang_EU import Num2Word_EU from .lang_EU import Num2Word_EU
class Num2Word_NL(Num2Word_EU): class Num2Word_NL(Num2Word_EU):
def set_high_numwords(self, high): def set_high_numwords(self, high):
max = 3 + 6 * len(high) max = 3 + 6 * len(high)
@@ -29,10 +30,23 @@ class Num2Word_NL(Num2Word_EU):
def setup(self): def setup(self):
self.negword = "min " self.negword = "min "
self.pointword = "komma" self.pointword = "komma"
self.errmsg_floatord = "Het zwevende puntnummer %s kan niet omgezet worden naar een ordernummer." # "Cannot treat float %s as ordinal." # "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_floatord = (
self.errmsg_negord = "Het negatieve getal %s kan niet omgezet worden naar een ordernummer." # "Cannot treat negative num %s as ordinal." "Het zwevende puntnummer %s kan niet omgezet worden " +
self.errmsg_toobig = "Het getal %s moet minder zijn dan %s." # "abs(%s) must be less than %s." "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."
)
# "abs(%s) must be less than %s."
self.errmsg_toobig = "Het getal %s moet minder zijn dan %s."
self.exclude_title = [] self.exclude_title = []
lows = ["non", "okt", "sept", "sext", "quint", "quadr", "tr", "b", "m"] lows = ["non", "okt", "sept", "sext", "quint", "quadr", "tr", "b", "m"]
@@ -41,13 +55,13 @@ class Num2Word_NL(Num2Word_EU):
tens = ["dez", "vigint", "trigint", "quadragint", "quinquagint", tens = ["dez", "vigint", "trigint", "quadragint", "quinquagint",
"sexagint", "septuagint", "oktogint", "nonagint"] "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"), self.mid_numwords = [(1000, "duizend"), (100, "honderd"),
(90, "negentig"), (80, "tachtig"), (70, "zeventig"), (90, "negentig"), (80, "tachtig"),
(60, "zestig"), (50, "vijftig"), (40, "veertig"), (70, "zeventig"), (60, "zestig"),
(50, "vijftig"), (40, "veertig"),
(30, "dertig")] (30, "dertig")]
self.low_numwords = ["twintig", "negentien", "achttien", "zeventien", self.low_numwords = ["twintig", "negentien", "achttien", "zeventien",
"zestien", "vijftien", "veertien", "dertien", "zestien", "vijftien", "veertien", "dertien",
@@ -128,6 +142,7 @@ class Num2Word_NL(Num2Word_EU):
return self.to_cardinal(val) return self.to_cardinal(val)
return self.to_splitnum(val, hightxt="honderd", longval=longval) return self.to_splitnum(val, hightxt="honderd", longval=longval)
n2w = Num2Word_NL() n2w = Num2Word_NL()
to_card = n2w.to_cardinal to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal to_ord = n2w.to_ordinal
@@ -136,9 +151,10 @@ to_ordnum = n2w.to_ordinal_num
def main(): def main():
for val in [1, 7, 8, 12, 17, 62, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1062, 1100, 1500, 1701,
8280, 8291, 150000, 500000, 3000000, 1000000, 2000001, 1000000000, 2000000000, 3000, 8280, 8291, 150000, 500000, 3000000, 1000000, 2000001,
-21212121211221211111, -2.121212, -1.0000100]: 1000000000, 2000000000, -21212121211221211111, -2.121212,
-1.0000100]:
n2w.test(val) n2w.test(val)
n2w.test(3000000) n2w.test(3000000)
@@ -149,6 +165,6 @@ def main():
print(n2w.to_year(1820)) print(n2w.to_year(1820))
print(n2w.to_year(2001)) print(n2w.to_year(2001))
if __name__ == "__main__": if __name__ == "__main__":
main() main()

View File

@@ -17,6 +17,7 @@
from __future__ import division, unicode_literals, print_function from __future__ import division, unicode_literals, print_function
from . import lang_EU from . import lang_EU
class Num2Word_NO(lang_EU.Num2Word_EU): class Num2Word_NO(lang_EU.Num2Word_EU):
def set_high_numwords(self, high): def set_high_numwords(self, high):
max = 3 + 6 * len(high) max = 3 + 6 * len(high)
@@ -53,7 +54,6 @@ class Num2Word_NO(lang_EU.Num2Word_EU):
"tolv": "tolvte", "tolv": "tolvte",
"tjue": "tjuende"} "tjue": "tjuende"}
def merge(self, lpair, rpair): def merge(self, lpair, rpair):
ltext, lnum = lpair ltext, lnum = lpair
rtext, rnum = rpair 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)
return ("%s, %s" % (ltext, rtext), lnum + rnum) return ("%s, %s" % (ltext, rtext), lnum + rnum)
def to_ordinal(self, value): def to_ordinal(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
outwords = self.to_cardinal(value).split(" ") outwords = self.to_cardinal(value).split(" ")
@@ -84,12 +83,10 @@ class Num2Word_NO(lang_EU.Num2Word_EU):
outwords[-1] = "".join(lastwords) outwords[-1] = "".join(lastwords)
return " ".join(outwords) return " ".join(outwords)
def to_ordinal_num(self, value): def to_ordinal_num(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
return "%s%s" % (value, self.to_ordinal(value)[-2:]) return "%s%s" % (value, self.to_ordinal(value)[-2:])
def to_year(self, val, longval=True): 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_cardinal(val)
@@ -107,6 +104,7 @@ to_ord = n2w.to_ordinal
to_ordnum = n2w.to_ordinal_num to_ordnum = n2w.to_ordinal_num
to_year = n2w.to_year to_year = n2w.to_year
def main(): def main():
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155, 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, 180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,

View File

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

View File

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

View File

@@ -21,6 +21,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .lang_EU import Num2Word_EU from .lang_EU import Num2Word_EU
class Num2Word_SL(Num2Word_EU): class Num2Word_SL(Num2Word_EU):
def set_high_numwords(self, high): def set_high_numwords(self, high):
max = 3 + 6*len(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] = word + "iljard"
self.cards[10**(n-3)] = word + "iljon" self.cards[10**(n-3)] = word + "iljon"
def setup(self): def setup(self):
self.negword = "minus " self.negword = "minus "
self.pointword = "celih" self.pointword = "celih"
@@ -37,15 +37,19 @@ class Num2Word_SL(Num2Word_EU):
self.errmsg_toobig = "Number is too large to convert to words." self.errmsg_toobig = "Number is too large to convert to words."
self.exclude_title = [] self.exclude_title = []
self.mid_numwords = [(1000, "tisoč"), (900, "devetsto"), (800, "osemsto"), self.mid_numwords = [(1000, "tisoč"), (900, "devetsto"),
(700, "sedemsto"), (600, "šesto"), (500, "petsto"), (400, "štiristo"), (300, "tristo"), (800, "osemsto"), (700, "sedemsto"),
(600, "šesto"), (500, "petsto"),
(400, "štiristo"), (300, "tristo"),
(200, "dvesto"), (100, "sto"), (200, "dvesto"), (100, "sto"),
(90, "devetdeset"), (80, "osemdeset"), (70, "sedemdeset"), (90, "devetdeset"), (80, "osemdeset"),
(60, "šestdeset"), (50, "petdeset"), (40, "štirideset"), (70, "sedemdeset"), (60, "šestdeset"),
(50, "petdeset"), (40, "štirideset"),
(30, "trideset")] (30, "trideset")]
self.low_numwords = ["dvajset", "devetnajst", "osemnajst", "sedemnajst", self.low_numwords = ["dvajset", "devetnajst", "osemnajst",
"šestnajst", "petnajst", "štirinajst", "trinajst", "sedemnajst", "šestnajst", "petnajst",
"dvanajst", "enajst", "deset", "devet", "osem", "sedem", "štirinajst", "trinajst", "dvanajst",
"enajst", "deset", "devet", "osem", "sedem",
"šest", "pet", "štiri", "tri", "dve", "ena", "šest", "pet", "štiri", "tri", "dve", "ena",
"nič"] "nič"]
self.ords = {"ena": "prv", self.ords = {"ena": "prv",
@@ -60,7 +64,6 @@ class Num2Word_SL(Num2Word_EU):
} }
self.ordflag = False self.ordflag = False
def merge(self, curr, next): def merge(self, curr, next):
ctext, cnum, ntext, nnum = curr + next ctext, cnum, ntext, nnum = curr + next
@@ -97,21 +100,20 @@ class Num2Word_SL(Num2Word_EU):
else: else:
ntext += "ov" ntext += "ov"
if nnum >= 10**2 and self.ordflag == False: if nnum >= 10**2 and self.ordflag is False:
ctext += " " ctext += " "
val = cnum * nnum val = cnum * nnum
else: else:
if nnum < 10 < cnum < 100: if nnum < 10 < cnum < 100:
ntext, ctext = ctext, ntext + "in" ntext, ctext = ctext, ntext + "in"
elif cnum >= 10**2 and self.ordflag == False: elif cnum >= 10**2 and self.ordflag is False:
ctext += " " ctext += " "
val = cnum + nnum val = cnum + nnum
word = ctext + ntext word = ctext + ntext
return (word, val) return (word, val)
def to_ordinal(self, value): def to_ordinal(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
self.ordflag = True self.ordflag = True
@@ -123,16 +125,15 @@ class Num2Word_SL(Num2Word_EU):
break break
return outword + "i" return outword + "i"
# Is this correct?? # Is this correct??
def to_ordinal_num(self, value): def to_ordinal_num(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
return str(value) + "." return str(value) + "."
def to_currency(self, val, longval=True, old=False): def to_currency(self, val, longval=True, old=False):
if old: if old:
return self.to_splitnum(val, hightxt="evro/a/v", lowtxt="stotin/a/i/ov", return self.to_splitnum(val, hightxt="evro/a/v",
lowtxt="stotin/a/i/ov",
jointxt="in", longval=longval) jointxt="in", longval=longval)
return super(Num2Word_SL, self).to_currency(val, jointxt="in", return super(Num2Word_SL, self).to_currency(val, jointxt="in",
longval=longval) longval=longval)
@@ -143,7 +144,6 @@ class Num2Word_SL(Num2Word_EU):
return self.to_splitnum(val, hightxt="hundert", longval=longval) return self.to_splitnum(val, hightxt="hundert", longval=longval)
n2w = Num2Word_SL() n2w = Num2Word_SL()
to_card = n2w.to_cardinal to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal to_ord = n2w.to_ordinal
@@ -161,5 +161,6 @@ def main():
print(n2w.to_currency(112121)) print(n2w.to_currency(112121))
print(n2w.to_year(2000)) print(n2w.to_year(2000))
if __name__ == "__main__": if __name__ == "__main__":
main() main()

View File

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

View File

@@ -180,7 +180,8 @@ THOUSANDS = {
CURRENCIES = { CURRENCIES = {
'UAH': ( 'UAH': (
(u'гривня', u'гривнi', u'гривень'), (u'копiйка', u'копiйки', u'копiйок') (u'гривня', u'гривнi', u'гривень'),
(u'копiйка', u'копiйки', u'копiйок')
), ),
'EUR': ( 'EUR': (
(u'евро', u'евро', u'евро'), (u'цент', u'центи', u'центiв') (u'евро', u'евро', u'евро'), (u'цент', u'центи', u'центiв')
@@ -205,7 +206,8 @@ def get_digits(n):
def pluralize(n, forms): 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 % 100 < 10 or n % 100 > 20):
if n % 10 == 1: if n % 10 == 1:
form = 0 form = 0
@@ -246,7 +248,6 @@ def int2word(n, feminine=True):
ones = ONES_FEMININE if i == 1 or feminine and i == 0 else ONES ones = ONES_FEMININE if i == 1 or feminine and i == 0 else ONES
words.append(ones[n1][0]) words.append(ones[n1][0])
if i > 0 and ((n1 + n2 + n3) > 0): if i > 0 and ((n1 + n2 + n3) > 0):
words.append(pluralize(x, THOUSANDS[i])) words.append(pluralize(x, THOUSANDS[i]))
@@ -313,4 +314,5 @@ class Num2Word_UK(object):
if __name__ == '__main__': if __name__ == '__main__':
import doctest import doctest
doctest.testmod() doctest.testmod()

View File

@@ -14,6 +14,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA # MA 02110-1301 USA
class OrderedMapping(dict): class OrderedMapping(dict):
def __init__(self, *pairs): def __init__(self, *pairs):
self.order = [] self.order = []