From 54a0cadf6006b07e4c3cd4ffdcb1e0e6fa53b600 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 27 May 2009 23:37:32 +0000 Subject: - Remove ``repoze.bfg.template`` module. All imports from this package have been deprecated since version 0.3.8. Instead, import ``get_template``, ``render_template``, and ``render_template_to_response`` from the ``repoze.bfg.chameleon_zpt``module. --- CHANGES.txt | 6 +++ repoze/bfg/template.py | 20 --------- repoze/bfg/tests/test_template.py | 89 --------------------------------------- 3 files changed, 6 insertions(+), 109 deletions(-) delete mode 100644 repoze/bfg/template.py delete mode 100644 repoze/bfg/tests/test_template.py diff --git a/CHANGES.txt b/CHANGES.txt index 8bc2becbd..0c792cfcf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,12 @@ Documentation Deprecated Alias Removals ------------------------- +- Remove ``repoze.bfg.template`` module. All imports from this + package have been deprecated since version 0.3.8. Instead, import + ``get_template``, ``render_template``, and + ``render_template_to_response`` from the + ``repoze.bfg.chameleon_zpt``module. + - Remove backwards compatibility alias for ``repoze.bfg.traversal.split_path`` (deprecated since 0.6.5). This must now be imported as ``repoze.bfg.traversal.traversal_path``). diff --git a/repoze/bfg/template.py b/repoze/bfg/template.py deleted file mode 100644 index ad6d50a44..000000000 --- a/repoze/bfg/template.py +++ /dev/null @@ -1,20 +0,0 @@ -# The definitions in this module are import aliases for backwards -# compatibility; there are no plans to make this module itself go -# away, but the ``get_template``, ``render_template``, and -# ``render_template_to_response`` APIs should be imported from -# ``repoze.bfg.chameleon_zpt`` in the future for optimum correctness. -# Two other functions named ``render_transform`` and -# ``render_transform_to_response`` APIs used to be here for XSLT -# support; those no longer exist here; you need to install and use the -# ``repoze.bfg.xslt`` package. -from zope.deprecation import deprecated - -from repoze.bfg.chameleon_zpt import get_template -from repoze.bfg.chameleon_zpt import render_template -from repoze.bfg.chameleon_zpt import render_template_to_response - -for name in ('get_template', 'render_template', 'render_template_to_response'): - deprecated(name, - ('repoze.bfg.template.%s should now be imported as ' - 'repoze.bfg.chameleon_zpt.%s' % (name, name))) - diff --git a/repoze/bfg/tests/test_template.py b/repoze/bfg/tests/test_template.py deleted file mode 100644 index 06aa61328..000000000 --- a/repoze/bfg/tests/test_template.py +++ /dev/null @@ -1,89 +0,0 @@ -import unittest - -from repoze.bfg.testing import cleanUp - -class Base(object): - def setUp(self): - cleanUp() - import warnings - warnings.simplefilter('ignore') - - def tearDown(self): - cleanUp() - import warnings - warnings.resetwarnings() - - def _zcmlConfigure(self): - import repoze.bfg.includes - import zope.configuration.xmlconfig - zope.configuration.xmlconfig.file('configure.zcml', - package=repoze.bfg.includes) - - def _getTemplatePath(self, name): - import os - here = os.path.abspath(os.path.dirname(__file__)) - return os.path.join(here, 'fixtures', name) - -class RenderTemplateTests(Base, unittest.TestCase): - def _callFUT(self, *arg, **kw): - from repoze.bfg.template import render_template - return render_template(*arg, **kw) - - def test_it(self): - self._zcmlConfigure() - minimal = self._getTemplatePath('minimal.pt') - result = self._callFUT(minimal) - self.failUnless(isinstance(result, unicode)) - self.assertEqual(result, - '
\n
') - -class RenderTemplateToResponseTests(Base, unittest.TestCase): - def _callFUT(self, *arg, **kw): - from repoze.bfg.template import render_template_to_response - return render_template_to_response(*arg, **kw) - - def test_it(self): - self._zcmlConfigure() - minimal = self._getTemplatePath('minimal.pt') - result = self._callFUT(minimal) - from webob import Response - self.failUnless(isinstance(result, Response)) - self.assertEqual(result.app_iter, - ['
\n
']) - self.assertEqual(result.status, '200 OK') - self.assertEqual(len(result.headerlist), 2) - -class GetTemplateTests(Base, unittest.TestCase): - def _callFUT(self, *arg, **kw): - from repoze.bfg.template import get_template - return get_template(*arg, **kw) - - def test_nonabs_registered(self): - self._zcmlConfigure() - from zope.component import getGlobalSiteManager - from zope.component import queryUtility - from repoze.bfg.chameleon_zpt import ZPTTemplateFactory - from repoze.bfg.interfaces import ITemplateRenderer - minimal = self._getTemplatePath('minimal.pt') - utility = ZPTTemplateFactory(minimal) - gsm = getGlobalSiteManager() - gsm.registerUtility(utility, ITemplateRenderer, name=minimal) - result = self._callFUT(minimal) - self.assertEqual(result.filename, minimal) - self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility) - - def test_nonabs_unregistered(self): - self._zcmlConfigure() - from zope.component import getGlobalSiteManager - from zope.component import queryUtility - from repoze.bfg.chameleon_zpt import ZPTTemplateFactory - from repoze.bfg.interfaces import ITemplateRenderer - minimal = self._getTemplatePath('minimal.pt') - self.assertEqual(queryUtility(ITemplateRenderer, minimal), None) - utility = ZPTTemplateFactory(minimal) - gsm = getGlobalSiteManager() - gsm.registerUtility(utility, ITemplateRenderer, name=minimal) - result = self._callFUT(minimal) - self.assertEqual(result.filename, minimal) - self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility) - -- cgit v1.2.3