Mercurial > genshi > genshi-test
comparison genshi/template/tests/markup.py @ 935:705727288d7e
Merge r1143 from py3k:
add support for python 3 to remaining genshi.template components:
* minor changes to track encoding=None API change in core genshi modules.
* genshi/template/directives:
* slightly odd syntax changes to make the 2to3 .next() fixer pick up *stream.next()
* minor test fix for change in behaviour of division (/) in Python 3.
* genshi/template/loader:
* add 'b' to file modes to ensure it's loaded as bytes in Python 3.
* use not isinstance(s, unicode) instead of isinstance(s, str) since the former is correctly converted by 2to3.
| author | hodgestar |
|---|---|
| date | Fri, 18 Mar 2011 09:17:52 +0000 |
| parents | 3c09c8d8a578 |
| children |
comparison
equal
deleted
inserted
replaced
| 934:7c9ec79caedc | 935:705727288d7e |
|---|---|
| 13 | 13 |
| 14 import doctest | 14 import doctest |
| 15 import os | 15 import os |
| 16 import pickle | 16 import pickle |
| 17 import shutil | 17 import shutil |
| 18 from StringIO import StringIO | |
| 19 import sys | 18 import sys |
| 20 import tempfile | 19 import tempfile |
| 21 import unittest | 20 import unittest |
| 22 | 21 |
| 22 from genshi.compat import BytesIO, StringIO | |
| 23 from genshi.core import Markup | 23 from genshi.core import Markup |
| 24 from genshi.input import XML | 24 from genshi.input import XML |
| 25 from genshi.template.base import BadDirectiveError, TemplateSyntaxError | 25 from genshi.template.base import BadDirectiveError, TemplateSyntaxError |
| 26 from genshi.template.loader import TemplateLoader, TemplateNotFound | 26 from genshi.template.loader import TemplateLoader, TemplateNotFound |
| 27 from genshi.template.markup import MarkupTemplate | 27 from genshi.template.markup import MarkupTemplate |
| 41 self.assertEqual('<root> 42 42</root>', str(tmpl.generate(var=42))) | 41 self.assertEqual('<root> 42 42</root>', str(tmpl.generate(var=42))) |
| 42 | 42 |
| 43 def test_pickle(self): | 43 def test_pickle(self): |
| 44 stream = XML('<root>$var</root>') | 44 stream = XML('<root>$var</root>') |
| 45 tmpl = MarkupTemplate(stream) | 45 tmpl = MarkupTemplate(stream) |
| 46 buf = StringIO() | 46 buf = BytesIO() |
| 47 pickle.dump(tmpl, buf, 2) | 47 pickle.dump(tmpl, buf, 2) |
| 48 buf.seek(0) | 48 buf.seek(0) |
| 49 unpickled = pickle.load(buf) | 49 unpickled = pickle.load(buf) |
| 50 self.assertEqual('<root>42</root>', str(unpickled.generate(var=42))) | 50 self.assertEqual('<root>42</root>', str(unpickled.generate(var=42))) |
| 51 | 51 |