Conjunto de mudanças 6536 no repositório publico

Timestamp:

21/06/2012 00:46:34 (9 anos atrás)

Autor:

mazza

Mensagem:

refatoracao: TemplateAware? eliminada, uma funcao basta

Localização:

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis

Arquivos:

• browser/boxes/manager.py (modificado) (5 diffs)
• tests/testunitboxes.py (modificado) (4 diffs)

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes/manager.py

@@ -23 +23 @@
 provideAdapter(PersistentDictionaryField)
 
-template_factory = Environment(loader=PackageLoader(__name__))
+_template_factory = Environment(loader=PackageLoader(__name__))
+
+def template(template_name):
+    return _template_factory.get_template(template_name)
 
 
-class TemplateAware(object):
-
-    @property
-    def template(self):
-        return template_factory.get_template(self.template_name)
-
-
-class BaseBox(TemplateAware):
+class BaseBox(object):
     """Base abstract class for editable boxes.
     """
-
-    template_name = 'basebox.html'
 
     def __init__(self, permission=ModifyPortalContent):
@@ -43 +37 @@
 
     def __call__(self, context):
-        return self.template.render(
+        return template('basebox.html').render(
             box=self,
             has_permission=self.has_permission(context),
@@ -78 +72 @@
 
     def inner_render(self, context):
-        template = template_factory.get_template(self.schema.__name__.lower() + '.html')
-        return template.render(self.get_data_from(context))
+        templ = template(self.schema.__name__.lower() + '.html')
+        return templ.render(self.get_data_from(context))
 
     def get_data_from(self, context):
@@ -142 +136 @@
 
 # ROWS
-class DtRow(TemplateAware):
-
-    template_name = 'dtrow.html'
+class DtRow(object):
 
     def __init__(self, *row_spec):
@@ -168 +160 @@
         `row_spec` is a sequence of cell specs: [(width, schema, number), ...]
         """
-        return self.template.render(cells=self.cells(context))
+        return template('dtrow.html').render(cells=self.cells(context))
 
 

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/tests/testunitboxes.py

@@ -13 +13 @@
     def test_box_render_basic(self):
 
-        with patch('il.portalinterlegis.browser.boxes.manager.template_factory', TemplateFactoryStub()):
+        with patch('il.portalinterlegis.browser.boxes.manager._template_factory', TemplateFactoryStub()):
 
             box = Box(IStubBox, 1)
@@ -26 +26 @@
 
     def test_box_render_editable(self):
-        with patch('il.portalinterlegis.browser.boxes.manager.template_factory', TemplateFactoryStub()):
+        with patch('il.portalinterlegis.browser.boxes.manager._template_factory', TemplateFactoryStub()):
             with patch('il.portalinterlegis.browser.boxes.manager.getSecurityManager') as security_mock:
                 security_mock.checkPermission.return_value = True
@@ -70 +70 @@
     pass
 
-from il.portalinterlegis.browser.boxes.manager import template_factory, BaseBox
+from il.portalinterlegis.browser.boxes.manager import _template_factory, BaseBox
 from jinja2 import Template
 
@@ -80 +80 @@
             return Template("{{var}}")
         elif name == "basebox.html":
-            return template_factory.get_template(name)
+            return _template_factory.get_template(name)
         else:
             raise AssertionError("Unexpected name: [%s]" % name)