diff options
| -rw-r--r-- | CHANGES.txt | 9 | ||||
| -rw-r--r-- | repoze/bfg/chameleon_zpt.py | 6 | ||||
| -rw-r--r-- | repoze/bfg/includes/configure.zcml | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 1db0f53d9..72baac96e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -33,6 +33,15 @@ Features incompatibilities, described in the "Backwards Incompatibilities" section below. +- We no longer include the ``configure.zcml`` of the ``chameleon.zpt`` + package within the ``configure.zcml`` of the "repoze.bfg.includes" + package. This has been a no-op for some time now. + +-The ``repoze.bfg.chameleon_zpt`` package no longer imports from + ``chameleon.zpt`` at module scope, deferring the import until later + within a method call. The ``chameleon.zpt`` package can't be + imported on platforms like GAE. + Backwards Incompatibilities --------------------------- diff --git a/repoze/bfg/chameleon_zpt.py b/repoze/bfg/chameleon_zpt.py index 187395bc6..4aca9826e 100644 --- a/repoze/bfg/chameleon_zpt.py +++ b/repoze/bfg/chameleon_zpt.py @@ -13,13 +13,15 @@ from repoze.bfg.interfaces import ISettings from repoze.bfg.templating import renderer_from_cache -from chameleon.zpt.template import PageTemplateFile - class ZPTTemplateRenderer(object): classProvides(ITemplateRendererFactory) implements(ITemplateRenderer) def __init__(self, path, auto_reload=False): + # import this here so BFG doesn't break at startup times on + # platforms that can't deal with even importing Chameleon + # (GAE) + from chameleon.zpt.template import PageTemplateFile self.template = PageTemplateFile(path, auto_reload=auto_reload) def implementation(self): diff --git a/repoze/bfg/includes/configure.zcml b/repoze/bfg/includes/configure.zcml index 33e1aed39..048a0cbc8 100644 --- a/repoze/bfg/includes/configure.zcml +++ b/repoze/bfg/includes/configure.zcml @@ -2,8 +2,6 @@ <include package="repoze.zcml" file="meta.zcml" /> - <include package="chameleon.zpt" file="configure.zcml"/> - <!-- traversal adapters --> <adapter |