1 --- a/mwlib/templ/nodes.py Tue Nov 18 14:23:02 2008 +0100
2 +++ b/mwlib/templ/nodes.py Tue Nov 18 14:23:14 2008 +0100
3 @@ -82,7 +82,8 @@
4 for key, value in args:
5 if key is not None:
6 key = optimize(list(key))
7 - value = optimize(list(value))
8 + if type(value) is tuple:
9 + value = optimize(list(value))
10
11
12 if key is None:
1.1 --- a/tests/test_expander.py Tue Nov 18 14:23:02 2008 +0100
1.2 +++ b/tests/test_expander.py Tue Nov 18 14:23:14 2008 +0100
1.3 @@ -357,3 +357,10 @@
1.4 def test_noinclude_end():
1.5 expandstr("{{foo}}", "foo", wikidb=DictDB(foo="foo<noinclude>bar should not be in expansion"))
1.6
1.7 +def test_monthnumber():
1.8 + wikidb = DictDB(MONTHNUMBER="{{#if:{{{1|}}}|{{#switch:{{lc:{{{1}}}}}|january|jan=1|february|feb=2|march|mar=3|apr|april=4|may=5|june|jun=6|july|jul=7|august|aug=8|september|sep=9|october|oct=10|november|nov=11|december|dec=12|{{#ifexpr:{{{1}}}<0|{{#ifexpr:(({{{1}}})round 0)!=({{{1}}})|{{#expr:12-(((0.5-({{{1}}}))round 0)mod 12)}}|{{#expr:12-(((11.5-({{{1}}}))round 0)mod 12)}}}}|{{#expr:(((10.5+{{{1}}})round 0)mod 12)+1}}}}}}|Missing required parameter 1=''month''!}}")
1.9 +
1.10 + expandstr("{{MONTHNUMBER|12}}", "12", wikidb=wikidb)
1.11 +
1.12 +def test_switch_default_template():
1.13 + expandstr("{{#switch:1|{{#if:1|5|12}}}}", "5")
2.1 --- a/tests/test_parser.py Tue Nov 18 14:23:02 2008 +0100
2.2 +++ b/tests/test_parser.py Tue Nov 18 14:23:14 2008 +0100
2.3 @@ -756,3 +756,14 @@
2.4 d = DummyDB()
2.5 r=uparser.parseString(title='', raw='\ttext', wikidb=d)
2.6 assert not r.find(parser.PreFormatted), 'unexpected PreFormatted node'
2.7 +
2.8 +@xfail
2.9 +def test_nowiki_inside_tags():
2.10 + """http://code.pediapress.com/wiki/ticket/366"""
2.11 +
2.12 + s = """<span style="color:<nowiki>#</nowiki>DF6108;">foo</span>"""
2.13 + r=parse(s)
2.14 + tags = r.find(parser.TagNode)
2.15 + assert tags, "no tag node found"
2.16 +
2.17 +