# HG changeset patch # User cmlenz # Date 1158499302 0 # Node ID ddc9655db244e91c521d68f79d47a78dce172136 # Parent 8fc0abce080144fa9d663a655d61487a8bd8a903 Remove another duplicate unit test, and add two more interpolation tests. diff --git a/MANIFEST.in b/MANIFEST.in --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ exclude doc/2000ft.graffle exclude doc/docutils.conf -exclude doc/logo.lineform +recursive-exclude doc/logo.lineform * exclude doc/Makefile include doc/*.html diff --git a/genshi/tests/template.py b/genshi/tests/template.py --- a/genshi/tests/template.py +++ b/genshi/tests/template.py @@ -827,12 +827,6 @@ self.assertEqual(Template.EXPR, parts[0][0]) self.assertEqual('bla', parts[0][1].source) - def test_interpolate_short(self): - parts = list(Template._interpolate('$bla')) - self.assertEqual(1, len(parts)) - self.assertEqual(Template.EXPR, parts[0][0]) - self.assertEqual('bla', parts[0][1].source) - def test_interpolate_short_starting_with_underscore(self): parts = list(Template._interpolate('$_bla')) self.assertEqual(1, len(parts)) @@ -857,6 +851,18 @@ self.assertEqual(Template.EXPR, parts[0][0]) self.assertEqual('foo.bar', parts[0][1].source) + def test_interpolate_short_starting_with_digit(self): + parts = list(Template._interpolate('$0bla')) + self.assertEqual(1, len(parts)) + self.assertEqual(Stream.TEXT, parts[0][0]) + self.assertEqual('$0bla', parts[0][1]) + + def test_interpolate_short_containing_digit(self): + parts = list(Template._interpolate('$foo0')) + self.assertEqual(1, len(parts)) + self.assertEqual(Template.EXPR, parts[0][0]) + self.assertEqual('foo0', parts[0][1].source) + def test_interpolate_mixed1(self): parts = list(Template._interpolate('$foo bar $baz')) self.assertEqual(3, len(parts))