allow use of XML templates again

Author: Richard Jones

CHANGES.txt

@@ -68,6 +68,7 @@ Fixed:
 - always honor indexme property on Strings (sf patch 1063711)
 - make hyperdb value parsing errors readable in mailgw errors
 - make anydbm journal export handle removed properties
+- allow use of XML templates again
 
 
 2004-10-15 0.7.8

roundup/cgi/templating.py

@@ -83,11 +83,12 @@ def find_template(dir, name, extension):
     if os.path.exists(src):
         return (src, filename)
 
-    # try with a .html extension (new-style)
-    filename = filename + '.html'
-    src = os.path.join(dir, filename)
-    if os.path.exists(src):
-        return (src, filename)
+    # try with a .html or .xml extension (new-style)
+    for extension in '.html', '.xml':
+        filename = filename + extension
+        src = os.path.join(dir, filename)
+        if os.path.exists(src):
+            return (src, filename)
 
     # no extension == no generic template is possible
     if not extension:
@@ -119,14 +120,19 @@ def precompileTemplates(self):
         ''' Go through a directory and precompile all the templates therein
         '''
         for filename in os.listdir(self.dir):
-            # skip files without ".html" extension - .css, .js etc.
-            if not filename.endswith(".html"):
-                continue
             # skip subdirs
             if os.path.isdir(filename):
                 continue
+            # skip files without ".html" or ".xml" extension - .css, .js etc.
+            for extension in '.html', '.xml':
+                if filename.endswith(extension):
+                    break
+            else:
+                continue
+
             # remove "html" extension
-            filename = filename[:-len(".html")]
+            filename = filename[:-len(extension)]
+
             # load the template
             if '.' in filename:
                 name, extension = filename.split('.', 1)