diff options
| author | Jason Madden <jamadden@gmail.com> | 2015-06-05 17:05:52 -0500 |
|---|---|---|
| committer | Jason Madden <jamadden@gmail.com> | 2015-06-05 17:05:52 -0500 |
| commit | 5cf88c5ad849a1b89d642e95d83bb1776b17600d (patch) | |
| tree | 6d59b63e82eb96813d8cb4a10f4df5c45f808d83 /src | |
| parent | 8b1c876664268682b6369795af958c669e91409b (diff) | |
| download | zope-pagetemplate-5cf88c5ad849a1b89d642e95d83bb1776b17600d.tar.gz | |
Add support for Python 3.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/zope/pagetemplate/pagetemplate.py | 6 | ||||
| -rw-r--r-- | src/zope/pagetemplate/tests/test_basictemplate.py | 4 | ||||
| -rw-r--r-- | src/zope/pagetemplate/tests/test_ptfile.py | 18 |
3 files changed, 16 insertions, 12 deletions
diff --git a/src/zope/pagetemplate/pagetemplate.py b/src/zope/pagetemplate/pagetemplate.py index 506c318..b6bf8c2 100644 --- a/src/zope/pagetemplate/pagetemplate.py +++ b/src/zope/pagetemplate/pagetemplate.py @@ -30,6 +30,8 @@ from zope.pagetemplate.interfaces import IPageTemplateProgram from zope.interface import implementer from zope.interface import provider +from six import u as _u + _default_options = {} @@ -44,7 +46,7 @@ class StringIO(list): self.append(value) def getvalue(self): - return u''.join(self) + return _u('').join(self) @implementer(IPageTemplateSubclassing) @@ -250,7 +252,7 @@ class PageTemplateEngine(object): self.program = program def __call__(self, context, macros, **options): - output = StringIO(u'') + output = StringIO(_u('')) interpreter = TALInterpreter( self.program, macros, context, stream=output, **options diff --git a/src/zope/pagetemplate/tests/test_basictemplate.py b/src/zope/pagetemplate/tests/test_basictemplate.py index f42ea1a..430a901 100644 --- a/src/zope/pagetemplate/tests/test_basictemplate.py +++ b/src/zope/pagetemplate/tests/test_basictemplate.py @@ -15,6 +15,8 @@ """ import unittest +from six import u as _u + from zope.pagetemplate.tests import util import zope.pagetemplate.pagetemplate import zope.component.testing @@ -204,7 +206,7 @@ class BasicTemplateTests(unittest.TestCase): self.t() def test_unicode_html(self): - text = u'<p>\xe4\xf6\xfc\xdf</p>' + text = _u('<p>\xe4\xf6\xfc\xdf</p>') # test with HTML parser self.t.pt_edit(text, 'text/html') diff --git a/src/zope/pagetemplate/tests/test_ptfile.py b/src/zope/pagetemplate/tests/test_ptfile.py index f7a0457..d6ecbcd 100644 --- a/src/zope/pagetemplate/tests/test_ptfile.py +++ b/src/zope/pagetemplate/tests/test_ptfile.py @@ -145,9 +145,9 @@ class TypeSniffingTestCase(unittest.TestCase): rendered = pt() self.assertTrue(isinstance(rendered, six.text_type)) self.assertEqual(rendered.strip(), - u"<html><head><title>" - u"\u0422\u0435\u0441\u0442" - u"</title></head></html>") + six.u("<html><head><title>" + "\u0422\u0435\u0441\u0442" + "</title></head></html>")) def test_html_encoding_by_meta(self): pt = self.get_pt( @@ -160,9 +160,9 @@ class TypeSniffingTestCase(unittest.TestCase): rendered = pt() self.assertTrue(isinstance(rendered, six.text_type)) self.assertEqual(rendered.strip(), - u"<html><head><title>" - u"\u0422\u0435\u0441\u0442" - u"</title></head></html>") + six.u("<html><head><title>" + "\u0422\u0435\u0441\u0442" + "</title></head></html>")) def test_xhtml(self): pt = self.get_pt( @@ -175,9 +175,9 @@ class TypeSniffingTestCase(unittest.TestCase): rendered = pt() self.assertTrue(isinstance(rendered, six.text_type)) self.assertEqual(rendered.strip(), - u"<html><head><title>" - u"\u0422\u0435\u0441\u0442" - u"</title></head></html>") + six.u("<html><head><title>" + "\u0422\u0435\u0441\u0442" + "</title></head></html>")) |