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

Many PEP8 fixes

Browse Source 
Signed-off-by: William Moreno Reyes <williamjmorenor@gmail.com>
This commit is contained in:
William Moreno Reyes
2017-10-23 15:58:00 -06:00
parent 27058f5ddc
commit e2ce7c2562
12 changed files with 35 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
num2words/__init__.py
View File

@@ -70,6 +70,7 @@ CONVERTER_CLASSES = {
'uk': lang_UK.Num2Word_UK()
}
def num2words(number, ordinal=False, lang='en'):
# We try the full language first
if lang not in CONVERTER_CLASSES:

34
num2words/base.py
View File

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

2
num2words/compat.py
View File

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

6
num2words/lang_AR.py
View File

@@ -18,6 +18,7 @@
from __future__ import division, unicode_literals, print_function
from . import lang_EU
class Num2Word_AR(lang_EU.Num2Word_EU):
def set_high_numwords(self, high):
max = 3 + 3*len(high)
@@ -48,7 +49,6 @@ class Num2Word_AR(lang_EU.Num2Word_EU):
"تسعة": "تاسع",
"اثناعشر": "ثاني عشر" }
def merge(self, lpair, rpair):
ltext, lnum = lpair
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)
def to_ordinal(self, value):
self.verify_ordinal(value)
outwords = self.to_cardinal(value).split(" ")
@@ -82,12 +81,10 @@ class Num2Word_AR(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)
@@ -105,6 +102,7 @@ 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,

1
num2words/lang_DE.py
View File

@@ -18,6 +18,7 @@
from __future__ import unicode_literals, print_function
from .lang_EU import Num2Word_EU
class Num2Word_DE(Num2Word_EU):
def set_high_numwords(self, high):
max = 3 + 6*len(high)

2
num2words/lang_DK.py
View File

@@ -17,6 +17,7 @@
from __future__ import division, unicode_literals, print_function
from num2words import lang_EU
class Num2Word_DK(lang_EU.Num2Word_EU):
def set_high_numwords(self, high):
max = 3 + 6*len(high)
@@ -138,6 +139,7 @@ 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,

2
num2words/lang_EN.py
View File

@@ -17,6 +17,7 @@
from __future__ import division, unicode_literals, print_function
from . import lang_EU
class Num2Word_EN(lang_EU.Num2Word_EU):
def set_high_numwords(self, high):
max = 3 + 3*len(high)
@@ -99,6 +100,7 @@ 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,

1
num2words/lang_NL.py
View File

@@ -18,6 +18,7 @@
from __future__ import unicode_literals, print_function
from .lang_EU import Num2Word_EU
class Num2Word_NL(Num2Word_EU):
def set_high_numwords(self, high):
max = 3 + 6*len(high)

3
num2words/lang_UK.py
View File

@@ -205,7 +205,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