diff options
| author | Chris McDonough <chrism@plope.com> | 2013-06-01 10:43:56 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-06-01 10:43:56 -0400 |
| commit | 77fa0b148d78eec179f3a58241a00f57cd4b30b1 (patch) | |
| tree | 9b176d23181cd33814b71cbee1e45a586bb56ea9 | |
| parent | 922b1d40c4523fdcf9b6f37f9ccd24fda80ec592 (diff) | |
| parent | 30715a7db397d90e786b85715303bfaf34109b31 (diff) | |
| download | pyramid-77fa0b148d78eec179f3a58241a00f57cd4b30b1.tar.gz pyramid-77fa0b148d78eec179f3a58241a00f57cd4b30b1.tar.bz2 pyramid-77fa0b148d78eec179f3a58241a00f57cd4b30b1.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | docs/designdefense.rst | 2 | ||||
| -rw-r--r-- | pyramid/chameleon_text.py | 3 | ||||
| -rw-r--r-- | pyramid/chameleon_zpt.py | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst index fdc57e0c1..ea46053a0 100644 --- a/docs/designdefense.rst +++ b/docs/designdefense.rst @@ -1691,7 +1691,7 @@ some sort of monolithic thing, and a lot of its software is usable externally. And while it's not really the job of this document to defend it, Zope has been around for over 10 years and has an incredibly large, active community. If you don't believe this, -http://taichino.appspot.com/pypi_ranking/authors is an eye-opening reality +http://pypi-ranking.info/author is an eye-opening reality check. Love Simplicity 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, |