summaryrefslogtreecommitdiff
path: root/repoze/bfg/tests/test_chameleon_zpt.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2008-12-21 03:33:08 +0000
committerChris McDonough <chrism@agendaless.com>2008-12-21 03:33:08 +0000
commit4e46a6f458fa31ca5f252dd31b1229fcb775299d (patch)
treec0e1edd7cd9aabbec53298b0db3c7868ac73db85 /repoze/bfg/tests/test_chameleon_zpt.py
parent6a530543757a92ed09b7ba624a868140f890511d (diff)
downloadpyramid-4e46a6f458fa31ca5f252dd31b1229fcb775299d.tar.gz
pyramid-4e46a6f458fa31ca5f252dd31b1229fcb775299d.tar.bz2
pyramid-4e46a6f458fa31ca5f252dd31b1229fcb775299d.zip
Backwards Incompatibilities (Major)
- Rather than prepare the "stock" implementations of the ZCML directives from the ``zope.configuration`` package for use under :mod:`repoze.bfg`, :mod:`repoze.bfg` now makes available the implementations of directives from the ``repoze.zcml`` package (see http://static.repoze.org/zcmldocs). As a result, the :mod:`repoze.bfg` package now depends on the ``repoze.zcml`` package, and no longer depends directly on the ``zope.component``, ``zope.configuration``, ``zope.interface``, or ``zope.proxy`` packages. The primary reason for this change is to enable us to eventually reduce the number of inappropriate :mod:`repoze.bfg` Zope package dependencies, as well as to shed features of dependent package directives that don't make sense for :mod:`repoze.bfg`. Note that currently the set of requirements necessary to use bfg has not changed. This is due to inappropriate Zope package requirements in ``chameleon.zpt``, which will hopefully be remedied soon. - BFG applications written prior to this release which expect the "stock" ``zope.component`` ZCML directive implementations (e.g. ``adapter``, ``subscriber``, or ``utility``) to function now must either 1) include the ``meta.zcml`` file from ``zope.component`` manually (e.g. ``<include package="zope.component" file="meta.zcml">``) and include the ``zope.security`` package as an ``install_requires`` dependency or 2) change the ZCML in their applications to use the declarations from `repoze.zcml <http://static.repoze.org/zcmldocs/>`_ instead of the stock declarations. ``repoze.zcml`` only makes available the ``adapter``, ``subscriber`` and ``utility`` directives. - The ``http://namespaces.repoze.org/bfg`` XML namespace is now the default XML namespace in ZCML for paster-generated applications. - The copies of BFG's ``meta.zcml`` and ``configure.zcml`` were removed from the root of the ``repoze.bfg`` package. In 0.3.6, a new package named ``repoze.bfg.includes`` was added, which contains the "correct" copies of these ZCML files; the ones that were removed were for backwards compatibility purposes. Other - The minimum requirement for ``chameleon.core`` is now 1.0b13. The minimum requirement for ``chameleon.zpt`` is now 1.0b7. The minimum requirement for ``chameleon.genshi`` is now 1.0b2.
Diffstat (limited to 'repoze/bfg/tests/test_chameleon_zpt.py')
-rw-r--r--repoze/bfg/tests/test_chameleon_zpt.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/repoze/bfg/tests/test_chameleon_zpt.py b/repoze/bfg/tests/test_chameleon_zpt.py
index d2ee1704f..995dd92e1 100644
--- a/repoze/bfg/tests/test_chameleon_zpt.py
+++ b/repoze/bfg/tests/test_chameleon_zpt.py
@@ -10,9 +10,10 @@ class Base(PlacelessSetup):
PlacelessSetup.tearDown(self)
def _zcmlConfigure(self):
- import repoze.bfg
+ import repoze.bfg.includes
import zope.configuration.xmlconfig
- zope.configuration.xmlconfig.file('configure.zcml', package=repoze.bfg)
+ zope.configuration.xmlconfig.file('configure.zcml',
+ package=repoze.bfg.includes)
def _getTemplatePath(self, name):
import os
@@ -51,7 +52,8 @@ class ZPTTemplateRendererTests(unittest.TestCase, Base):
instance = self._makeOne(minimal)
result = instance()
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
def test_implementation(self):
self._zcmlConfigure()
@@ -59,7 +61,8 @@ class ZPTTemplateRendererTests(unittest.TestCase, Base):
instance = self._makeOne(minimal)
result = instance.implementation()()
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
class RenderTemplateTests(unittest.TestCase, Base):
@@ -79,7 +82,8 @@ class RenderTemplateTests(unittest.TestCase, Base):
render = self._getFUT()
result = render(minimal)
self.failUnless(isinstance(result, str))
- self.assertEqual(result, '<div>\n</div>\n')
+ self.assertEqual(result,
+ '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>')
class RenderTemplateToResponseTests(unittest.TestCase, Base):
def setUp(self):
@@ -99,7 +103,8 @@ class RenderTemplateToResponseTests(unittest.TestCase, Base):
result = render(minimal)
from webob import Response
self.failUnless(isinstance(result, Response))
- self.assertEqual(result.app_iter, ['<div>\n</div>\n'])
+ self.assertEqual(result.app_iter,
+ ['<div xmlns="http://www.w3.org/1999/xhtml">\n</div>'])
self.assertEqual(result.status, '200 OK')
self.assertEqual(len(result.headerlist), 2)