diff options
-rw-r--r-- | pagetemplatefile.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pagetemplatefile.py b/pagetemplatefile.py index da73aa9..6e7e0fc 100644 --- a/pagetemplatefile.py +++ b/pagetemplatefile.py @@ -16,7 +16,7 @@ Zope object encapsulating a Page Template from the filesystem. """ -__version__ = '$Revision: 1.4 $'[11:-2] +__version__ = '$Revision: 1.5 $'[11:-2] __metaclass__ = type @@ -63,7 +63,13 @@ class PageTemplateFile(PageTemplate): text = f.read() finally: f.close() - self.pt_edit(text, sniff_type(text)) + t = sniff_type(text) + if t != "text/xml" and "\r" in text: + # For HTML, we really want the file read in text mode: + f = open(self.filename) + text = f.read() + f.close() + self.pt_edit(text, t) self._cook() if self._v_errors: logging.error('PageTemplateFile: Error in template: %s', |