[Checkins] SVN: megrok.genshi/trunk/src/megrok/genshi/ Cleanup.
Lennart Regebro
regebro at gmail.com
Thu Oct 4 11:06:53 EDT 2007
Log message for revision 80617:
Cleanup.
Changed:
U megrok.genshi/trunk/src/megrok/genshi/components.py
U megrok.genshi/trunk/src/megrok/genshi/templatereg.py
-=-
Modified: megrok.genshi/trunk/src/megrok/genshi/components.py
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/components.py 2007-10-04 15:06:46 UTC (rev 80616)
+++ megrok.genshi/trunk/src/megrok/genshi/components.py 2007-10-04 15:06:52 UTC (rev 80617)
@@ -17,20 +17,13 @@
import grok.interfaces
import genshi.template
-class GenshiMarkupTemplate(grok.components.GrokPageTemplate):
+class GenshiMarkupTemplateFile(grok.components.GrokPageTemplate):
zope.interface.implements(grok.interfaces.ITemplateFile)
- def __init__(self, filename=None, _prefix=None, html=None):
- if ((html is not None and filename is not None) or
- (html is None and filename is None)):
- raise AssertionError("You must pass either html or filename but not both.")
-
- if html is not None:
- self._template = genshi.template.MarkupTemplate(html)
- else:
- loader = genshi.template.TemplateLoader(_prefix)
- self._template = loader.load(filename)
+ def __init__(self, filename, _prefix=None):
+ loader = genshi.template.TemplateLoader(_prefix)
+ self._template = loader.load(filename)
def __call__(self, namespace):
stream = self._template.generate(**namespace)
@@ -47,20 +40,13 @@
namespace.update(view.getTemplateVariables())
return self(namespace)
-class GenshiTextTemplate(grok.components.GrokPageTemplate):
+class GenshiTextTemplateFile(grok.components.GrokPageTemplate):
zope.interface.implements(grok.interfaces.ITemplateFile)
- def __init__(self, filename=None, _prefix=None, html=None):
- if ((html is not None and filename is not None) or
- (html is None and filename is None)):
- raise AssertionError("You must pass either html or filename but not both.")
-
- if html is not None:
- self._template = genshi.template.TextTemplate(html)
- else:
- loader = genshi.template.TemplateLoader(_prefix)
- self._template = loader.load(filename, cls=genshi.template.TextTemplate)
+ def __init__(self, filename, _prefix=None):
+ loader = genshi.template.TemplateLoader(_prefix)
+ self._template = loader.load(filename, cls=genshi.template.TextTemplate)
def __call__(self, namespace):
stream = self._template.generate(**namespace)
Modified: megrok.genshi/trunk/src/megrok/genshi/templatereg.py
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/templatereg.py 2007-10-04 15:06:46 UTC (rev 80616)
+++ megrok.genshi/trunk/src/megrok/genshi/templatereg.py 2007-10-04 15:06:52 UTC (rev 80617)
@@ -22,7 +22,7 @@
grok.name('gmt')
def __call__(self, filename, _prefix=None):
- return components.GenshiMarkupTemplate(filename, _prefix)
+ return components.GenshiMarkupTemplateFile(filename, _prefix)
class GenshiTextTemplateFileFactory(grok.GlobalUtility):
@@ -30,5 +30,5 @@
grok.name('gtt')
def __call__(self, filename, _prefix=None):
- return components.GenshiTextTemplate(filename, _prefix)
+ return components.GenshiTextTemplateFile(filename, _prefix)
\ No newline at end of file
More information about the Checkins
mailing list