diff options
| author | Chris McDonough <chrism@agendaless.com> | 2008-07-14 23:55:33 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2008-07-14 23:55:33 +0000 |
| commit | 7c87eb2da206f0578ce19628f7319156561f74da (patch) | |
| tree | 5116be952ad1740d42329366079915613758b217 | |
| parent | 15c928aae555bc7f9080d748eceb65b83e32c9fb (diff) | |
| download | pyramid-7c87eb2da206f0578ce19628f7319156561f74da.tar.gz pyramid-7c87eb2da206f0578ce19628f7319156561f74da.tar.bz2 pyramid-7c87eb2da206f0578ce19628f7319156561f74da.zip | |
Misc fixes
| -rw-r--r-- | repoze/bfg/__init__.py | 1 | ||||
| -rw-r--r-- | repoze/bfg/template.py | 4 | ||||
| -rw-r--r-- | repoze/bfg/zcml.py | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/repoze/bfg/__init__.py b/repoze/bfg/__init__.py index 7add3dca8..f763824a5 100644 --- a/repoze/bfg/__init__.py +++ b/repoze/bfg/__init__.py @@ -1,2 +1 @@ from repoze.bfg.router import make_app # for import elsewhere -from repoze.bfg.template import render_template diff --git a/repoze/bfg/template.py b/repoze/bfg/template.py index 4cd78f4f4..efb9f2c55 100644 --- a/repoze/bfg/template.py +++ b/repoze/bfg/template.py @@ -37,7 +37,7 @@ def registerTemplate(template, path): else: sm.registerUtility(template, IView, name=path) -def render_template_explicit(path, **kw): +def render_template(path, **kw): # XXX use pkg_resources if not os.path.isabs(path): @@ -56,5 +56,3 @@ def render_template_explicit(path, **kw): registerTemplate(template, path) return template(**kw) - -render_template = render_template_explicit diff --git a/repoze/bfg/zcml.py b/repoze/bfg/zcml.py index 1cfdcf953..1133b3d0b 100644 --- a/repoze/bfg/zcml.py +++ b/repoze/bfg/zcml.py @@ -18,7 +18,7 @@ from repoze.bfg.interfaces import IViewFactory from repoze.bfg.interfaces import IView from repoze.bfg.template import Z3CPTTemplateFactory -from repoze.bfg.template import render_template_explicit +from repoze.bfg.template import render_template class TemplateOnlyView(object): implements(IView) @@ -35,7 +35,7 @@ class TemplateOnlyView(object): 'a TemplateOnlyView') kw = dict(view=self, context=self.context, request=self.request, options=kw) - return render_template_explicit(self.template, **kw) + return render_template(self.template, **kw) def __repr__(self): klass = self.__class__ |