odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] res_lang: removed dead code (original_group function). 

That function was kept because its `intersperse` reimplementation
behaves a bit differently but it was a long time ago and no bug
report appeared. So the new function is good enough.

bzr revid: vmt@openerp.com-20130212111244-aayco60ps923fn55
This commit is contained in:
Vo Minh Thu 2013-02-12 12:12:44 +01:00
parent f1d660c853
commit 74e53085af
2 changed files with 26 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openerp/addons/base/res/res_lang.py
View File

@ -228,45 +228,6 @@ class lang(osv.osv):
lang()
def original_group(s, grouping, thousands_sep=''):
if not grouping:
return s, 0
result = ""
seps = 0
spaces = ""
if s[-1] == ' ':
sp = s.find(' ')
spaces = s[sp:]
s = s[:sp]
while s and grouping:
# if grouping is -1, we are done
if grouping[0] == -1:
break
# 0: re-use last group ad infinitum
elif grouping[0] != 0:
#process last group
group = grouping[0]
grouping = grouping[1:]
if result:
result = s[-group:] + thousands_sep + result
seps += 1
else:
result = s[-group:]
s = s[:-group]
if s and s[-1] not in "0123456789":
# the leading string is only spaces and signs
return s + result + spaces, seps
if not result:
return s + spaces, seps
if s:
result = s + thousands_sep + result
seps += 1
return result + spaces, seps
def split(l, counts):
"""

64
openerp/addons/base/tests/test_res_lang.py
View File

@ -4,47 +4,35 @@ import openerp.tests.common as common
class test_res_lang(common.TransactionCase):
def test_00(self):
from openerp.addons.base.res.res_lang import original_group, intersperse
def test_00_intersperse(self):
from openerp.addons.base.res.res_lang import intersperse
for g in [original_group, intersperse]:
# print "asserts on", g.func_name
assert g("", []) == ("", 0), "Assert passed"
assert g("0", []) == ("0", 0), "Assert passed"
assert g("012", []) == ("012", 0), "Assert passed"
assert g("1", []) == ("1", 0), "Assert passed"
assert g("12", []) == ("12", 0), "Assert passed"
assert g("123", []) == ("123", 0), "Assert passed"
assert g("1234", []) == ("1234", 0), "Assert passed"
assert g("123456789", []) == ("123456789", 0), "Assert passed"
assert g("&ab%#@1", []) == ("&ab%#@1", 0), "Assert passed"
assert intersperse("", []) == ("", 0), "Assert passed"
assert intersperse("0", []) == ("0", 0), "Assert passed"
assert intersperse("012", []) == ("012", 0), "Assert passed"
assert intersperse("1", []) == ("1", 0), "Assert passed"
assert intersperse("12", []) == ("12", 0), "Assert passed"
assert intersperse("123", []) == ("123", 0), "Assert passed"
assert intersperse("1234", []) == ("1234", 0), "Assert passed"
assert intersperse("123456789", []) == ("123456789", 0), "Assert passed"
assert intersperse("&ab%#@1", []) == ("&ab%#@1", 0), "Assert passed"
assert g("0", []) == ("0", 0), "Assert passed"
assert g("0", [1]) == ("0", 0), "Assert passed"
assert g("0", [2]) == ("0", 0), "Assert passed"
assert g("0", [200]) == ("0", 0), "Assert passed"
assert intersperse("0", []) == ("0", 0), "Assert passed"
assert intersperse("0", [1]) == ("0", 0), "Assert passed"
assert intersperse("0", [2]) == ("0", 0), "Assert passed"
assert intersperse("0", [200]) == ("0", 0), "Assert passed"
# breaks original_group:
if g.func_name == 'intersperse':
assert g("12345678", [0], '.') == ('12345678', 0)
assert g("", [1], '.') == ('', 0)
assert g("12345678", [1], '.') == ('1234567.8', 1)
assert g("12345678", [1], '.') == ('1234567.8', 1)
assert g("12345678", [2], '.') == ('123456.78', 1)
assert g("12345678", [2,1], '.') == ('12345.6.78', 2)
assert g("12345678", [2,0], '.') == ('12.34.56.78', 3)
assert g("12345678", [-1,2], '.') == ('12345678', 0)
assert g("12345678", [2,-1], '.') == ('123456.78', 1)
assert g("12345678", [2,0,1], '.') == ('12.34.56.78', 3)
assert g("12345678", [2,0,0], '.') == ('12.34.56.78', 3)
assert g("12345678", [2,0,-1], '.') == ('12.34.56.78', 3)
assert g("12345678", [3,3,3,3], '.') == ('12.345.678', 2)
assert original_group("abc1234567xy", [2], '.') == ('abc1234567.xy', 1)
assert original_group("abc1234567xy8", [2], '.') == ('abc1234567xy8', 0) # difference here...
assert original_group("abc12", [3], '.') == ('abc12', 0)
assert original_group("abc12", [2], '.') == ('abc12', 0)
assert original_group("abc12", [1], '.') == ('abc1.2', 1)
assert intersperse("12345678", [1], '.') == ('1234567.8', 1)
assert intersperse("12345678", [1], '.') == ('1234567.8', 1)
assert intersperse("12345678", [2], '.') == ('123456.78', 1)
assert intersperse("12345678", [2,1], '.') == ('12345.6.78', 2)
assert intersperse("12345678", [2,0], '.') == ('12.34.56.78', 3)
assert intersperse("12345678", [-1,2], '.') == ('12345678', 0)
assert intersperse("12345678", [2,-1], '.') == ('123456.78', 1)
assert intersperse("12345678", [2,0,1], '.') == ('12.34.56.78', 3)
assert intersperse("12345678", [2,0,0], '.') == ('12.34.56.78', 3)
assert intersperse("12345678", [2,0,-1], '.') == ('12.34.56.78', 3)
assert intersperse("12345678", [3,3,3,3], '.') == ('12.345.678', 2)
assert intersperse("abc1234567xy", [2], '.') == ('abc1234567.xy', 1)
assert intersperse("abc1234567xy8", [2], '.') == ('abc1234567x.y8', 1) # ... w.r.t. here.