diff options
| author | Tres Seaver <tseaver@palladion.com> | 2013-05-22 13:25:24 -0700 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2013-05-22 13:25:24 -0700 |
| commit | 5dba6be0ec858b56e6fab00dec1767575bd32329 (patch) | |
| tree | 26036f9270ec43673194f7964677af6145e16aa3 | |
| parent | 922b1d40c4523fdcf9b6f37f9ccd24fda80ec592 (diff) | |
| parent | 4073a408f05a4ee925c82fb8989a3c3994d0a454 (diff) | |
| download | pyramid-5dba6be0ec858b56e6fab00dec1767575bd32329.tar.gz pyramid-5dba6be0ec858b56e6fab00dec1767575bd32329.tar.bz2 pyramid-5dba6be0ec858b56e6fab00dec1767575bd32329.zip | |
Merge pull request #1024 from vstojkovic/defer_chameleon_import
Defer imports of Chameleon until needed. Fixes #1021.
| -rw-r--r-- | pyramid/chameleon_text.py | 3 | ||||
| -rw-r--r-- | pyramid/chameleon_zpt.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pyramid/chameleon_text.py b/pyramid/chameleon_text.py index 8cf04bf79..d2a943a28 100644 --- a/pyramid/chameleon_text.py +++ b/pyramid/chameleon_text.py @@ -1,7 +1,5 @@ from zope.interface import implementer -from chameleon.zpt.template import PageTextTemplateFile - from pyramid.interfaces import ITemplateRenderer from pyramid.decorator import reify @@ -20,6 +18,7 @@ class TextTemplateRenderer(object): @reify # avoid looking up reload_templates before manager pushed def template(self): + from chameleon.zpt.template import PageTextTemplateFile return PageTextTemplateFile(self.path, auto_reload=self.lookup.auto_reload, debug=self.lookup.debug, diff --git a/pyramid/chameleon_zpt.py b/pyramid/chameleon_zpt.py index d8a8ee1be..89e5d02b5 100644 --- a/pyramid/chameleon_zpt.py +++ b/pyramid/chameleon_zpt.py @@ -1,7 +1,5 @@ from zope.interface import implementer -from chameleon.zpt.template import PageTemplateFile - from pyramid.interfaces import ITemplateRenderer from pyramid.decorator import reify from pyramid import renderers @@ -18,6 +16,7 @@ class ZPTTemplateRenderer(object): @reify # avoid looking up reload_templates before manager pushed def template(self): + from chameleon.zpt.template import PageTemplateFile tf = PageTemplateFile( self.path, auto_reload=self.lookup.auto_reload, |