Mercurial > genshi > mirror
comparison genshi/tests/core.py @ 1041:cddcb39ce5dd stable-0.7.x
Merge r1266 from trunk (support for iterators in _speedups.Markup.join).
| author | hodgestar |
|---|---|
| date | Thu, 20 Mar 2014 11:44:48 +0000 |
| parents | 657f9ecffa3c |
| children |
comparison
equal
deleted
inserted
replaced
| 1038:9da42eed139b | 1041:cddcb39ce5dd |
|---|---|
| 137 def test_join(self): | 137 def test_join(self): |
| 138 markup = Markup('<br />').join(['foo', '<bar />', Markup('<baz />')]) | 138 markup = Markup('<br />').join(['foo', '<bar />', Markup('<baz />')]) |
| 139 assert type(markup) is Markup | 139 assert type(markup) is Markup |
| 140 self.assertEquals('foo<br /><bar /><br /><baz />', markup) | 140 self.assertEquals('foo<br /><bar /><br /><baz />', markup) |
| 141 | 141 |
| 142 def test_join_over_iter(self): | |
| 143 items = ['foo', '<bar />', Markup('<baz />')] | |
| 144 markup = Markup('<br />').join(i for i in items) | |
| 145 self.assertEquals('foo<br /><bar /><br /><baz />', markup) | |
| 146 | |
| 142 def test_stripentities_all(self): | 147 def test_stripentities_all(self): |
| 143 markup = Markup('& j').stripentities() | 148 markup = Markup('& j').stripentities() |
| 144 assert type(markup) is Markup | 149 assert type(markup) is Markup |
| 145 self.assertEquals('& j', markup) | 150 self.assertEquals('& j', markup) |
| 146 | 151 |