diff options
| author | Tres Seaver <tseaver@palladion.com> | 2015-06-06 12:33:13 -0400 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2015-06-06 12:33:13 -0400 |
| commit | d9c7646ad962f15b38fa0d2e779e5287190baa88 (patch) | |
| tree | c184257e0aa4c0933ab739d8ee3078f88f41420d | |
| parent | 8b1c876664268682b6369795af958c669e91409b (diff) | |
| parent | 4e38b2a58077431f960c9ff5b44ccd472290285d (diff) | |
| download | zope-pagetemplate-d9c7646ad962f15b38fa0d2e779e5287190baa88.tar.gz | |
Merge branch 'py32'
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | CHANGES.rst | 2 | ||||
| -rw-r--r-- | setup.py | 3 | ||||
| -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 | ||||
| -rw-r--r-- | tox.ini | 11 |
7 files changed, 26 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 796195e..2d1dcc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ sudo: false env: - TOXENV=py26 - TOXENV=py27 + - TOXENV=py32 - TOXENV=py33 - TOXENV=py34 - TOXENV=pypy diff --git a/CHANGES.rst b/CHANGES.rst index 11489b5..275f2ab 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,7 @@ Changes 4.2.1 (unreleased) ------------------ -- TBD +- Add support for Python 3.2. 4.2.0 (2015-06-02) ------------------ @@ -96,6 +96,7 @@ setup(name='zope.pagetemplate', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: Implementation :: CPython', @@ -119,7 +120,7 @@ setup(name='zope.pagetemplate', 'zope.component', 'zope.tales', 'zope.tal', - 'zope.i18n', + 'zope.i18n >= 4.0.1', 'zope.i18nmessageid', 'zope.traversing', ], 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>")) @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py33,py34,pypy,pypy3 + py26,py27,py32,py33,py34,pypy,pypy3 [testenv] deps = @@ -17,14 +17,15 @@ deps = zope.testrunner zope.traversing commands = - python setup.py test -q + python setup.py -q test -q -[testenv:py26] +[testenv:py27] deps = {[testenv]deps} zope.untrustedpython RestrictedPython -[testenv:py27] +[testenv:py26] deps = - {[testenv:py26]deps} + {[testenv:py27]deps} + ordereddict |