diff options
Diffstat (limited to 'src/zope/pagetemplate/tests')
| -rw-r--r-- | src/zope/pagetemplate/tests/batch.py | 2 | ||||
| -rw-r--r-- | src/zope/pagetemplate/tests/test_basictemplate.py | 20 | ||||
| -rw-r--r-- | src/zope/pagetemplate/tests/test_engine.py | 32 | ||||
| -rw-r--r-- | src/zope/pagetemplate/tests/test_htmltests.py | 4 | ||||
| -rw-r--r-- | src/zope/pagetemplate/tests/test_ptfile.py | 27 | ||||
| -rw-r--r-- | src/zope/pagetemplate/tests/util.py | 20 |
6 files changed, 52 insertions, 53 deletions
diff --git a/src/zope/pagetemplate/tests/batch.py b/src/zope/pagetemplate/tests/batch.py index b6cb872..c63d6b8 100644 --- a/src/zope/pagetemplate/tests/batch.py +++ b/src/zope/pagetemplate/tests/batch.py @@ -15,7 +15,7 @@ """ -class batch(object): +class batch: """Create a sequence batch""" def __init__(self, sequence, size, start=0, end=0, diff --git a/src/zope/pagetemplate/tests/test_basictemplate.py b/src/zope/pagetemplate/tests/test_basictemplate.py index 014dc74..5b421c5 100644 --- a/src/zope/pagetemplate/tests/test_basictemplate.py +++ b/src/zope/pagetemplate/tests/test_basictemplate.py @@ -15,10 +15,11 @@ """ import unittest -from zope.pagetemplate.tests import util -import zope.pagetemplate.pagetemplate import zope.component.testing +import zope.pagetemplate.pagetemplate +from zope.pagetemplate.tests import util + class BasicTemplateTests(unittest.TestCase): @@ -82,17 +83,18 @@ class BasicTemplateTests(unittest.TestCase): output = self.t.pt_render({}) self.assertEqual(output, 'foo') - from zope.pagetemplate.interfaces import IPageTemplateEngine from zope.component import provideUtility - class DummyProgram(object): + from zope.pagetemplate.interfaces import IPageTemplateEngine + + class DummyProgram: def __init__(self, *args): self.args = args def __call__(self, *args, **kwargs): return self.args, (self,) + args, kwargs - class DummyEngine(object): + class DummyEngine: @staticmethod def cook(*args): return DummyProgram(*args), "macros" @@ -204,7 +206,7 @@ class BasicTemplateTests(unittest.TestCase): self.t() def test_unicode_html(self): - text = u'<p>\xe4\xf6\xfc\xdf</p>' + text = '<p>\xe4\xf6\xfc\xdf</p>' # test with HTML parser self.t.pt_edit(text, 'text/html') @@ -230,7 +232,7 @@ class BasicTemplateTests(unittest.TestCase): self.assertEqual(e[0], 'Macro expansion failed') def test_convert(self): - string = u'binary' + string = 'binary' text = b'binary' self.assertEqual(text, self.t._convert(string, text)) @@ -264,7 +266,7 @@ class BasicTemplateTests(unittest.TestCase): class TestPageTemplateTracebackSupplement(unittest.TestCase): def test_errors_old_style(self): - class PT(object): + class PT: def pt_errors(self, ns): return (ns,) @@ -274,7 +276,7 @@ class TestPageTemplateTracebackSupplement(unittest.TestCase): self.assertEqual(pts.warnings, ['ns']) def test_errors_none(self): - class PT(object): + class PT: def pt_errors(self, ns, check_macro_expansion=False): return None diff --git a/src/zope/pagetemplate/tests/test_engine.py b/src/zope/pagetemplate/tests/test_engine.py index 0caeb93..946cfba 100644 --- a/src/zope/pagetemplate/tests/test_engine.py +++ b/src/zope/pagetemplate/tests/test_engine.py @@ -16,9 +16,11 @@ import doctest import re import unittest -import zope.pagetemplate.engine -from zope.testing.renormalizing import RENormalizing + from zope.component.testing import PlacelessSetup +from zope.testing.renormalizing import RENormalizing + +import zope.pagetemplate.engine class EngineTests(PlacelessSetup, @@ -43,13 +45,20 @@ class EngineTests(PlacelessSetup, self.assertEqual(ctx.getValue('context'), 4) -class DummyEngine(object): +class DummyEngine: def getTypes(self): return {} + def getCompilerError(self): + # This is only here to get meaningful errors if RestrictedPython denies + # execution of some code. + def get_error(text): # pragma: no cover + raise RuntimeError(text) # pragma: no cover + return get_error # pragma: no cover -class DummyContext(object): + +class DummyContext: _engine = DummyEngine() @@ -73,8 +82,9 @@ class ZopePythonExprTests(unittest.TestCase): @unittest.skipUnless(zope.pagetemplate.engine.HAVE_UNTRUSTED, "Needs untrusted") def test_forbidden_module_name(self): - from zope.pagetemplate.engine import ZopePythonExpr from zope.security.interfaces import Forbidden + + from zope.pagetemplate.engine import ZopePythonExpr expr = ZopePythonExpr('python', '__import__("sys").exit', DummyEngine()) self.assertRaises(Forbidden, expr, DummyContext()) @@ -139,8 +149,8 @@ class TestZopeContext(PlacelessSetup, def test_evaluate_interpreter_found(self): get = zope.pagetemplate.engine._get_iinterpreter - from zope import interface from zope import component + from zope import interface class IInterpreter(interface.Interface): pass @@ -149,7 +159,7 @@ class TestZopeContext(PlacelessSetup, return IInterpreter @interface.implementer(IInterpreter) - class Interpreter(object): + class Interpreter: def evaluateRawCode(self, code, globs): globs['new'] = code return 42 @@ -198,15 +208,9 @@ class TestAppPT(unittest.TestCase): def test_suite(): checker = RENormalizing([ - # Python 3 includes module name in exceptions - (re.compile(r"zope.security.interfaces.ForbiddenAttribute"), - "ForbiddenAttribute"), - (re.compile(r"<class 'zope.security._proxy._Proxy'>"), - "<type 'zope.security._proxy._Proxy'>"), - (re.compile(r"<class 'list'>"), "<type 'list'>"), # PyPy/pure-Python implementation (re.compile(r"<class 'zope.security.proxy.ProxyPy'>"), - "<type 'zope.security._proxy._Proxy'>"), + "<class 'zope.security._proxy._Proxy'>"), ]) suite = unittest.defaultTestLoader.loadTestsFromName(__name__) diff --git a/src/zope/pagetemplate/tests/test_htmltests.py b/src/zope/pagetemplate/tests/test_htmltests.py index 80f6c0b..de08f17 100644 --- a/src/zope/pagetemplate/tests/test_htmltests.py +++ b/src/zope/pagetemplate/tests/test_htmltests.py @@ -15,11 +15,11 @@ """ import unittest -from zope.pagetemplate.tests import util from zope.pagetemplate.pagetemplate import PageTemplate +from zope.pagetemplate.tests import util -class Folder(object): +class Folder: context = property(lambda self: self) diff --git a/src/zope/pagetemplate/tests/test_ptfile.py b/src/zope/pagetemplate/tests/test_ptfile.py index ee7fd0d..7e62111 100644 --- a/src/zope/pagetemplate/tests/test_ptfile.py +++ b/src/zope/pagetemplate/tests/test_ptfile.py @@ -17,11 +17,10 @@ import os import tempfile import unittest -import six from zope.pagetemplate.pagetemplatefile import PageTemplateFile -class AbstractPTCase(object): +class AbstractPTCase: def get_pt(self, text=b'<html />'): with tempfile.NamedTemporaryFile(mode='wb', delete=False) as f: @@ -142,11 +141,11 @@ class TypeSniffingTestCase(AbstractPTCase, b"\xd0\xa2\xd0\xb5\xd1\x81\xd1\x82" b"</title></head></html>") rendered = pt() - self.assertTrue(isinstance(rendered, six.text_type)) + self.assertTrue(isinstance(rendered, str)) self.assertEqual(rendered.strip(), - (u"<html><head><title>" - u"\u0422\u0435\u0441\u0442" - u"</title></head></html>")) + ("<html><head><title>" + "\u0422\u0435\u0441\u0442" + "</title></head></html>")) def test_html_encoding_by_meta(self): pt = self.get_pt( @@ -157,11 +156,11 @@ class TypeSniffingTestCase(AbstractPTCase, b' content="text/html; charset=windows-1251">' b"</head></html>") rendered = pt() - self.assertTrue(isinstance(rendered, six.text_type)) + self.assertTrue(isinstance(rendered, str)) self.assertEqual(rendered.strip(), - (u"<html><head><title>" - u"\u0422\u0435\u0441\u0442" - u"</title></head></html>")) + ("<html><head><title>" + "\u0422\u0435\u0441\u0442" + "</title></head></html>")) def test_xhtml(self): pt = self.get_pt( @@ -172,11 +171,11 @@ class TypeSniffingTestCase(AbstractPTCase, b' content="text/html; charset=windows-1251"/>' b"</head></html>") rendered = pt() - self.assertTrue(isinstance(rendered, six.text_type)) + self.assertTrue(isinstance(rendered, str)) self.assertEqual(rendered.strip(), - (u"<html><head><title>" - u"\u0422\u0435\u0441\u0442" - u"</title></head></html>")) + ("<html><head><title>" + "\u0422\u0435\u0441\u0442" + "</title></head></html>")) class TestPageTemplateFile(AbstractPTCase, diff --git a/src/zope/pagetemplate/tests/util.py b/src/zope/pagetemplate/tests/util.py index 55dbebd..1e18d23 100644 --- a/src/zope/pagetemplate/tests/util.py +++ b/src/zope/pagetemplate/tests/util.py @@ -13,15 +13,16 @@ ############################################################################## """Utilities """ -from __future__ import print_function + import os import re import sys import unittest + import zope.pagetemplate.tests -class arg(object): +class arg: __allow_access_to_unprotected_subobjects__ = 1 def __init__(self, nn, aa): @@ -31,7 +32,7 @@ class arg(object): return str(self.arg) -class argv(object): +class argv: __allow_access_to_unprotected_subobjects__ = 1 def __init__(self, argv=None): @@ -43,14 +44,7 @@ class argv(object): context = property(lambda self: self) -class _Test(unittest.TestCase): - - def runTest(self): # pragma: no cover 2.7 compatibility - return - - -_assertEqual = _Test().assertEqual -del _Test +_assertEqual = unittest.TestCase().assertEqual def check_html(s1, s2): @@ -85,11 +79,11 @@ output_dir = os.path.join(here, 'output') def read_input(filename): filename = os.path.join(input_dir, filename) - with open(filename, 'r') as f: + with open(filename) as f: return f.read() def read_output(filename): filename = os.path.join(output_dir, filename) - with open(filename, 'r') as f: + with open(filename) as f: return f.read() |