Log message for revision 85778: Removed deprecated modules from Products.PageTemplates.
Changed: U Zope/trunk/doc/CHANGES.txt U Zope/trunk/lib/python/Products/PageTemplates/PageTemplate.py D Zope/trunk/lib/python/Products/PageTemplates/PathIterator.py D Zope/trunk/lib/python/Products/PageTemplates/PythonExpr.py D Zope/trunk/lib/python/Products/PageTemplates/TALES.py D Zope/trunk/lib/python/Products/PageTemplates/tests/testTALES.py -=- Modified: Zope/trunk/doc/CHANGES.txt =================================================================== --- Zope/trunk/doc/CHANGES.txt 2008-04-26 20:42:59 UTC (rev 85777) +++ Zope/trunk/doc/CHANGES.txt 2008-04-26 20:55:47 UTC (rev 85778) @@ -9,6 +9,8 @@ Restructuring + - Removed deprecated modules from Products.PageTemplates. + - Removed deprecated ZCML directives from Five including the whole Five.site subpackage. Modified: Zope/trunk/lib/python/Products/PageTemplates/PageTemplate.py =================================================================== --- Zope/trunk/lib/python/Products/PageTemplates/PageTemplate.py 2008-04-26 20:42:59 UTC (rev 85777) +++ Zope/trunk/lib/python/Products/PageTemplates/PageTemplate.py 2008-04-26 20:55:47 UTC (rev 85778) @@ -22,24 +22,6 @@ from zope.tales.expressions import SimpleModuleImporter from Products.PageTemplates.Expressions import getEngine -############################################################################## -# BBB 2005/05/01 -- to be removed after 12 months -_ModuleImporter = SimpleModuleImporter -ModuleImporter = SimpleModuleImporter() -import zope.deprecation -zope.deprecation.deprecated( - ('ModuleImporter', '_ModuleImporter'), - "Zope 2 uses the Zope 3 ZPT engine now. ModuleImporter has moved " - "to zope.pagetemplate.pagetemplate.SimpleModuleImporter (this is a " - "class, not an instance)." - ) -zope.deprecation.deprecated( - ('PTRuntimeError', 'PageTemplateTracebackSupplement'), - "Zope 2 uses the Zope 3 ZPT engine now. The object you're importing " - "has moved to zope.pagetemplate.pagetemplate. This reference will " - "be gone in Zope 2.12.", - ) -############################################################################## class PageTemplate(ExtensionClass.Base, zope.pagetemplate.pagetemplate.PageTemplate): Deleted: Zope/trunk/lib/python/Products/PageTemplates/PathIterator.py =================================================================== --- Zope/trunk/lib/python/Products/PageTemplates/PathIterator.py 2008-04-26 20:42:59 UTC (rev 85777) +++ Zope/trunk/lib/python/Products/PageTemplates/PathIterator.py 2008-04-26 20:55:47 UTC (rev 85778) @@ -1,25 +0,0 @@ -############################################################################## -# -# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE -# -############################################################################## -"""Path Iterator - -BBB 2005/05/01 -- to be removed after 12 months - -$Id$ -""" -import zope.deferredimport -zope.deferredimport.deprecated( - "It has been renamed to PathIterator and moved to the " - "Products.PageTemplates.Expressions module. This reference will be " - "gone in Zope 2.12.", - PathIterator = "Products.PageTemplates.Expressions:PathIterator" - ) Deleted: Zope/trunk/lib/python/Products/PageTemplates/PythonExpr.py =================================================================== --- Zope/trunk/lib/python/Products/PageTemplates/PythonExpr.py 2008-04-26 20:42:59 UTC (rev 85777) +++ Zope/trunk/lib/python/Products/PageTemplates/PythonExpr.py 2008-04-26 20:55:47 UTC (rev 85778) @@ -1,19 +0,0 @@ -############################################################################## -# -# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE -# -############################################################################## -"""Generic Python Expression Handler - -$Id$ -""" -# BBB 2005/05/01 -- remove after 12 months -import zope.deprecation -zope.deprecation.moved("zope.tales.pythonexpr", "2.12") Deleted: Zope/trunk/lib/python/Products/PageTemplates/TALES.py =================================================================== --- Zope/trunk/lib/python/Products/PageTemplates/TALES.py 2008-04-26 20:42:59 UTC (rev 85777) +++ Zope/trunk/lib/python/Products/PageTemplates/TALES.py 2008-04-26 20:55:47 UTC (rev 85778) @@ -1,25 +0,0 @@ -############################################################################## -# -# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE -# -############################################################################## -"""TALES - -BBB 2005/05/01 -- to be removed after 12 months - -$Id$ -""" -from zope.tales.tests.simpleexpr import SimpleExpr -from zope.tales.tales import ExpressionEngine as Engine -from zope.tales.tales import _default as Default -from Products.PageTemplates.Expressions import SafeMapping - -import zope.deprecation -zope.deprecation.moved("zope.tales.tales", "2.12") Deleted: Zope/trunk/lib/python/Products/PageTemplates/tests/testTALES.py =================================================================== --- Zope/trunk/lib/python/Products/PageTemplates/tests/testTALES.py 2008-04-26 20:42:59 UTC (rev 85777) +++ Zope/trunk/lib/python/Products/PageTemplates/tests/testTALES.py 2008-04-26 20:55:47 UTC (rev 85778) @@ -1,145 +0,0 @@ -import unittest - -# BBB 2005/05/01 -- to be changed after 12 months -# ignore deprecation warnings on import for now -import warnings -showwarning = warnings.showwarning -warnings.showwarning = lambda *a, **k: None -# this old import should remain here until the TALES.py module is -# completely removed, so that API backward compatibility is properly -# tested -from Products.PageTemplates import TALES -# restore warning machinery -warnings.showwarning = showwarning - -from zope.tales.tests.test_tales import Harness - -class DummyUnicodeExpr: - '''Dummy expression type handler returning unicode''' - def __init__(self, name, expr, engine): - self._name = name - self._expr = expr - def __call__(self, econtext): - return unicode(self._expr, 'latin1') - def __repr__(self): - return '<SimpleExpr %s %s>' % (self._name, `self._expr`) - -class TALESTests(unittest.TestCase): - - def testIterator0(self): - '''Test sample Iterator class''' - context = Harness(self) - it = TALES.Iterator('name', (), context) - assert not it.next(), "Empty iterator" - context._complete_() - - def testIterator1(self): - '''Test sample Iterator class''' - context = Harness(self) - it = TALES.Iterator('name', (1,), context) - context._assert_('setLocal', 'name', 1) - assert it.next() and not it.next(), "Single-element iterator" - context._complete_() - - def testIterator2(self): - '''Test sample Iterator class''' - context = Harness(self) - it = TALES.Iterator('text', 'text', context) - for c in 'text': - context._assert_('setLocal', 'text', c) - for c in 'text': - assert it.next(), "Multi-element iterator" - assert not it.next(), "Multi-element iterator" - context._complete_() - - def testRegisterType(self): - '''Test expression type registration''' - e = TALES.Engine() - e.registerType('simple', TALES.SimpleExpr) - assert e.getTypes()['simple'] == TALES.SimpleExpr - - def testRegisterTypeUnique(self): - '''Test expression type registration uniqueness''' - e = TALES.Engine() - e.registerType('simple', TALES.SimpleExpr) - try: - e.registerType('simple', TALES.SimpleExpr) - except TALES.RegistrationError: - pass - else: - assert 0, "Duplicate registration accepted." - - def testRegisterTypeNameConstraints(self): - '''Test constraints on expression type names''' - e = TALES.Engine() - for name in '1A', 'A!', 'AB ': - try: - e.registerType(name, TALES.SimpleExpr) - except TALES.RegistrationError: - pass - else: - assert 0, 'Invalid type name "%s" accepted.' % name - - def testCompile(self): - '''Test expression compilation''' - e = TALES.Engine() - e.registerType('simple', TALES.SimpleExpr) - ce = e.compile('simple:x') - assert ce(None) == ('simple', 'x'), ( - 'Improperly compiled expression %s.' % `ce`) - - def testGetContext(self): - '''Test Context creation''' - TALES.Engine().getContext() - TALES.Engine().getContext(v=1) - TALES.Engine().getContext(x=1, y=2) - - def getContext(self, **kws): - e = TALES.Engine() - e.registerType('simple', TALES.SimpleExpr) - e.registerType('unicode', DummyUnicodeExpr) - return e.getContext(**kws) - - def testContext0(self): - '''Test use of Context''' - se = self.getContext().evaluate('simple:x') - assert se == ('simple', 'x'), ( - 'Improperly evaluated expression %s.' % `se`) - - def testContextUnicode(self): - '''Test evaluateText on unicode-returning expressions''' - se = self.getContext().evaluateText('unicode:\xe9') - self.assertEqual(se, u'\xe9') - - def testVariables(self): - '''Test variables''' - ctxt = self.getContext() - ctxt.beginScope() - ctxt.setLocal('v1', 1) - ctxt.setLocal('v2', 2) - - c = ctxt.vars - assert c['v1'] == 1, 'Variable "v1"' - - ctxt.beginScope() - ctxt.setLocal('v1', 3) - ctxt.setGlobal('g', 1) - - c = ctxt.vars - assert c['v1'] == 3, 'Inner scope' - assert c['v2'] == 2, 'Outer scope' - assert c['g'] == 1, 'Global' - - ctxt.endScope() - - c = ctxt.vars - assert c['v1'] == 1, "Uncovered local" - assert c['g'] == 1, "Global from inner scope" - - ctxt.endScope() - -def test_suite(): - return unittest.makeSuite(TALESTests) - -if __name__=='__main__': - unittest.main(defaultTest='test_suite') _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins