[Checkins] SVN: grokcore.view/trunk/src/grokcore/view/ Changed the templatereg so it uses again has_no_render.
Souheil CHELFOUH
souheil at chelfouh.com
Thu Sep 17 04:10:19 EDT 2009
Log message for revision 104172:
Changed the templatereg so it uses again has_no_render.
Changed the view grokker to have its "has_no_render" return a "not has_render".
Removed the assert on the template that expects a IGrokView component : it doesn
't work with viewlets.
Changed:
U grokcore.view/trunk/src/grokcore/view/components.py
U grokcore.view/trunk/src/grokcore/view/meta/views.py
U grokcore.view/trunk/src/grokcore/view/templatereg.py
-=-
Modified: grokcore.view/trunk/src/grokcore/view/components.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/components.py 2009-09-17 08:05:45 UTC (rev 104171)
+++ grokcore.view/trunk/src/grokcore/view/components.py 2009-09-17 08:10:18 UTC (rev 104172)
@@ -233,7 +233,6 @@
factory.macros = property(_get_macros)
def render(self, view):
- assert interfaces.IGrokView.providedBy(view)
namespace = self.getNamespace(view)
template = self._template
namespace.update(template.pt_getContext())
Modified: grokcore.view/trunk/src/grokcore/view/meta/views.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/meta/views.py 2009-09-17 08:05:45 UTC (rev 104171)
+++ grokcore.view/trunk/src/grokcore/view/meta/views.py 2009-09-17 08:10:18 UTC (rev 104172)
@@ -84,7 +84,8 @@
return render and not base_method
def has_no_render(factory):
- return not getattr(factory, 'render', None)
+ return not has_render(factory)
+
templates.checkTemplates(module_info, factory, 'view',
has_render, has_no_render)
Modified: grokcore.view/trunk/src/grokcore/view/templatereg.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/templatereg.py 2009-09-17 08:05:45 UTC (rev 104171)
+++ grokcore.view/trunk/src/grokcore/view/templatereg.py 2009-09-17 08:10:18 UTC (rev 104172)
@@ -92,7 +92,6 @@
def checkTemplates(self, module_info, factory, component_name,
has_render, has_no_render):
- # TODO: remove has_no_render arg, it's not used anymore
factory_name = factory.__name__.lower()
template_name = grokcore.view.template.bind().get(factory)
if template_name is None:
@@ -129,7 +128,7 @@
"an associated template." %
(component_name, factory), factory)
- if not factory_have_template and not has_render(factory):
+ if not factory_have_template and has_no_render(factory):
# we do not accept a view without any way to render it
raise GrokError("%s %r has no associated template or "
"'render' method." %
More information about the checkins
mailing list