nettoyer la branche

This commit is contained in:
2015-08-20 07:58:17 +04:00
parent 8e7644aedf
commit 7643573a8e
293 changed files with 2510 additions and 2511 deletions

View File

@@ -18,7 +18,7 @@ class ClassTest(TC):
eq(["a"], split_args(" a "))
eq(['a', 'b c', "'d", "e'", 'a"b'],
split_args(r'''a "b c" 'd e' "a\"b"'''))
def test_join_args(self):
eq = self.assertEqual
eq(None, join_args(None))
@@ -29,7 +29,7 @@ class ClassTest(TC):
eq('" a "', join_args([" a "]))
eq(r'''a "b c" 'd e' "a\"b"''',
join_args(['a', 'b c', "'d", "e'", 'a"b']))
def test_build_options(self):
eq = self.assertEqual
eq(('ab:c', ['aaa', 'bbb=', 'cc', 'ccc']),

View File

@@ -15,21 +15,21 @@ class ClassTest(TC):
def test_sorted(self):
eq, _, _, _ = self.tf()
eq([1,2,3], sorted([3,2,1]))
def test_updated(self):
eq, ist, isf, _ = self.tf()
eq({"n": "v"}, updated(None, n="v"))
eq({"n": "v"}, updated({}, n="v"))
d = {"k": "v"}
eq({"n": "v", "k": "v"}, updated(d, n="v"))
d = {"n": "v"}
eq({"n": "v"}, updated(d, n="v"))
ist(d == updated(d, n="v"))
isf(d is updated(d, n="v"))
def test_isnum(self):
_, ist, isf, _ = self.tf()
@@ -42,7 +42,7 @@ class ClassTest(TC):
isf(isnum(u"unicode"))
isf(isnum(()))
isf(isnum([]))
def test_isbool(self):
_, ist, isf, _ = self.tf()
@@ -55,7 +55,7 @@ class ClassTest(TC):
isf(isbool(u"unicode"))
isf(isbool(()))
isf(isbool([]))
def test_isseq(self):
_, ist, isf, _ = self.tf()
@@ -68,15 +68,15 @@ class ClassTest(TC):
isf(isseq(u"unicode"))
ist(isseq(()))
ist(isseq([]))
def test_seqof(self):
eq, ist, _, _ = self.tf()
et = ()
t = (1,2,3)
el = []
l = [1,2,3]
eq([0], seqof(0))
eq([0L], seqof(0L))
eq([None], seqof(None))
@@ -94,7 +94,7 @@ class ClassTest(TC):
eq(el, seqof(el))
ist(et is seqof(et))
ist(el is seqof(el))
eq(t, seqof(None, t))
eq(l, seqof(None, l))
ist(t is seqof(None, t))
@@ -103,7 +103,7 @@ class ClassTest(TC):
eq(el, seqof(None, el))
ist(et is seqof(None, et))
ist(el is seqof(None, el))
def test_firstof(self):
eq, _, _, _ = self.tf()
@@ -162,69 +162,69 @@ class ClassTest(TC):
ist(isstr(u"unicode"))
isf(isstr(()))
isf(isstr([]))
def test_all_matches(self):
_, ist, isf, _ = self.tf()
l1 = [1,2,3]
l2 = [-3,-2,-1,1,2,3]
l3 = [-3,-2,-1]
positive = lambda n: n>0
ist(all_matches(positive, l1))
isf(all_matches(positive, l2))
isf(all_matches(positive, l3))
ist(all_matches(positive, 1))
isf(all_matches(positive, -1))
def test_one_match(self):
_, ist, isf, _ = self.tf()
l1 = [1,2,3]
l2 = [-3,-2,-1,1,2,3]
l3 = [-3,-2,-1]
positive = lambda n: n>0
ist(one_match(positive, l1))
ist(one_match(positive, l2))
isf(one_match(positive, l3))
ist(one_match(positive, 1))
isf(one_match(positive, -1))
def test_strip_nl(self):
eq, ist, _, _ = self.tf()
eq(None, strip_nl(None))
eq("", strip_nl(""))
ist(isbytes(strip_nl("")))
eq(u"", strip_nl(u""))
ist(isunicode(strip_nl(u"")))
eq("str", strip_nl("str"))
ist(isbytes(strip_nl("str")))
eq(u"unicode", strip_nl(u"unicode"))
ist(isunicode(strip_nl(u"unicode")))
eq("str", strip_nl("str\r"))
ist(isbytes(strip_nl("str\r")))
eq(u"unicode", strip_nl(u"unicode\r"))
ist(isunicode(strip_nl(u"unicode\r")))
eq("str", strip_nl("str\r\n"))
ist(isbytes(strip_nl("str\r\n")))
eq(u"unicode", strip_nl(u"unicode\r\n"))
ist(isunicode(strip_nl(u"unicode\r\n")))
eq("str", strip_nl("str\n"))
ist(isbytes(strip_nl("str\n")))
eq(u"unicode", strip_nl(u"unicode\n"))
ist(isunicode(strip_nl(u"unicode\n")))
eq("str\n", strip_nl("str\n\n"))
ist(isbytes(strip_nl("str\n\n")))
eq(u"unicode\n", strip_nl(u"unicode\n\n"))
ist(isunicode(strip_nl(u"unicode\n\n")))
eq("str\r\n", strip_nl("str\r\n\n"))
ist(isbytes(strip_nl("str\r\n\n")))
eq(u"unicode\r\n", strip_nl(u"unicode\r\n\n"))
@@ -232,7 +232,7 @@ class ClassTest(TC):
def test_norm_nl(self):
eq, ist, _, _ = self.tf()
eq(None, norm_nl(None))
eq("", norm_nl(""))
ist(isbytes(norm_nl("")))
@@ -240,42 +240,42 @@ class ClassTest(TC):
if check_version("2.5"): ist(isunicode(norm_nl(u"")))
elif check_version("2.4"): ist(isbytes(norm_nl(u"")))
elif check_version("2.3"): ist(isbytes(norm_nl(u"")))
eq("str", norm_nl("str"))
ist(isbytes(norm_nl("str")))
eq(u"unicode", norm_nl(u"unicode"))
ist(isunicode(norm_nl(u"unicode")))
eq("str\n", norm_nl("str\r"))
ist(isbytes(norm_nl("str\r")))
eq(u"unicode\n", norm_nl(u"unicode\r"))
ist(isunicode(norm_nl(u"unicode\r")))
eq("str\n", norm_nl("str\r\n"))
ist(isbytes(norm_nl("str\r\n")))
eq(u"unicode\n", norm_nl(u"unicode\r\n"))
ist(isunicode(norm_nl(u"unicode\r\n")))
eq("str\n", norm_nl("str\n"))
ist(isbytes(norm_nl("str\n")))
eq(u"unicode\n", norm_nl(u"unicode\n"))
ist(isunicode(norm_nl(u"unicode\n")))
eq("str\n\n", norm_nl("str\n\n"))
ist(isbytes(norm_nl("str\n\n")))
eq(u"unicode\n\n", norm_nl(u"unicode\n\n"))
ist(isunicode(norm_nl(u"unicode\n\n")))
eq("str\n\n", norm_nl("str\r\n\n"))
ist(isbytes(norm_nl("str\r\n\n")))
eq(u"unicode\n\n", norm_nl(u"unicode\r\n\n"))
ist(isunicode(norm_nl(u"unicode\r\n\n")))
def test_make_getter(self): pass
def test_make_setter(self): pass
def test_make_deleter(self): pass
def test_make_prop(self): pass
def test_getattrs(self):
eq, _, _, ex = self.tf()
@@ -302,7 +302,7 @@ class ClassTest(TC):
ex(AttributeError, getattrs, a, "b.c.z.m")
eq(None, getattrs(a, "b.c.n"))
eq(None, getattrs(a, "b.c.n.m"))
eq(1, getattrs(a, "x", True))
ex(AttributeError, getattrs, a, "x.m", True)
eq(None, getattrs(a, "n", True))
@@ -315,7 +315,7 @@ class ClassTest(TC):
ex(AttributeError, getattrs, a, "b.c.z.m", True)
eq(None, getattrs(a, "b.c.n", True))
ex(AttributeError, getattrs, a, "b.c.n.m", True)
def test_setattrs(self): pass
def test_delattrs(self): pass
def test_make_delegate(self): pass

View File

@@ -32,20 +32,20 @@ class ClassTest(TC):
eq("value50:value51", cf.get("var5"))
eq(" value60 : value61 ", cf.get("var6"))
eq("$X ${X} \\\" \\\\ \\$ \\`", cf.get("var7"))
eq(["\\", "value30", "value31", ""], cf.get_list("var3"))
eq(["", "value40", "value41"], cf.get_list("var4"))
eq(["value50", "value51"], cf.get_paths("var5"))
eq([" value60 ", " value61 "], cf.get_paths("var6"))
eq(["\\", "value30", "value31"], cf.get_list("var3", True))
eq(["value40", "value41"], cf.get_list("var4", True))
eq(["value50", "value51"], cf.get_paths("var5", True))
eq(["value60", "value61"], cf.get_paths("var6", True))
def test_sh_config(self):
eq, _, _, _ = self.tf()
if os.environ.has_key("X"): del os.environ["X"]
cf = ShConfigFile(self.get_file("test.sh_config"))
eq("value0", cf.get("var0"))
@@ -56,21 +56,21 @@ class ClassTest(TC):
eq("value50:value51", cf.get("var5"))
eq(" value60 : value61 ", cf.get("var6"))
eq(" \" \\ $ \\`", cf.get("var7"))
eq(["value30", "value31", ""], cf.get_list("var3"))
eq(["", "value40", "value41"], cf.get_list("var4"))
eq(["value50", "value51"], cf.get_paths("var5"))
eq([" value60 ", " value61 "], cf.get_paths("var6"))
eq(["value30", "value31"], cf.get_list("var3", True))
eq(["value40", "value41"], cf.get_list("var4", True))
eq(["value50", "value51"], cf.get_paths("var5", True))
eq(["value60", "value61"], cf.get_paths("var6", True))
os.environ["X"] = "valueX"
cf = ShConfigFile(self.get_file("test.sh_config"))
eq("valueX valueX \" \\ $ \\`", cf.get("var7"))
def test_plist(self):
#XXX test PListFile
pass