Changeset 5714

Timestamp:

11/18/08 14:42:04 (2 months ago)

Author:

faide

Message:

Import fixes to keep python < 2.5 compatibility. Added support for Genshi translation based on the i18n.run_template_filter config parameter. Thanks to Dag Bralti for this one!

Files:

• branches/1.1/turbogears/view/base.py (modified) (7 diffs)

branches/1.1/turbogears/view/base.py

@@ -1 @@
-
+
+
+
+
+
-
-import sys
@@ -10 +14 @@
-import cherrypy
-import genshi
+from genshi.filters import Translator
-import pkg_resources
-
-import turbogears
-from turbogears import identity, config
-
-
-
-
+
+
+
-
-log = logging.getLogger("turbogears.view")
@@ -81 +85 @@
-
-    @param fragment: passed through to tell the template if only a
-
+
+
+
-    @type fragment: bool
-
@@ -125 +131 @@
-                if isinstance(content_format, (tuple, list)):
-                    content_format = content_format[0]
+
-                if isinstance(content_format, str):
-                    content_format = content_format.split(
-                        )[0].split('-' , 1)[0].lower()
+
-                else:
-                    content_format = 'html'
+
-            else:
-                content_format = 'html'
+
-            content_type = get_mime_type_for_format(content_format)
+
-        if mime_type_has_charset(
-                content_type) and '; charset=' not in content_type:
-            charset = get_template_encoding_default(enginename)
+
-            if charset:
-                content_type += '; charset=' + charset
+
-        headers['Content-Type'] = content_type
-
@@ -285 +298 @@
-    if hasattr(element, 'tag'):
-        return genshi.input.ET(element)
+
-    elif isinstance(element, list):
-        return chain(*imap(genshi_et, element))
+
-    else:
-        return element
@@ -391 +406 @@
-
-    """
+    
+    def genshi_loader_callback(template):
+        """Callback to add a gettext Translator filter to Genshi templates.
+        The Translator filter must be first in the list of filters.
+
+        Defined inside the scope of the load_engines because this is
+        not a public function and we don't want to temp people with it.
+        """
+        template.filters.insert(0, Translator(gettext))
+    
-    get = config.get
+
+    # Check if the i18n filter is activated in configuration.
+    # if so we'll need to apply a translator to the Genshi filter list
+    if get("i18n.run_template_filter", False):
+        callback = get("genshi.loader_callback", genshi_loader_callback)
+        config.update({'genshi.loader_callback': callback})
+    
-    engine_options = {
-        "cheetah.importhooks": get("cheetah.importhooks", False),
@@ -421 +453 @@
-        "mako.output_encoding": get("mako.output_encoding", "utf-8")
-    }
+
-    for entrypoint in pkg_resources.iter_entry_points(
-            "python.templating.engines"):
-        engine = entrypoint.load()
-        engines[entrypoint.name] = engine(stdvars, engine_options)
+