Log message for revision 71578:
fixes
Changed:
U
Zope/branches/ajung-zpt-encoding-fixes/lib/python/Products/PageTemplates/ZopePageTemplate.py
-=-
Modified:
Zope/branches/ajung-zpt-encoding-fixes/lib/python/Products/PageTemplates/ZopePageTemplate.py
===================================================================
---
Zope/branches/ajung-zpt-encoding-fixes/lib/python/Products/PageTemplates/ZopePageTemplate.py
2006-12-17 20:24:43 UTC (rev 71577)
+++
Zope/branches/ajung-zpt-encoding-fixes/lib/python/Products/PageTemplates/ZopePageTemplate.py
2006-12-17 20:24:56 UTC (rev 71578)
@@ -122,7 +122,7 @@
self.id = id
self.expand = 0
self.ZBindings_edit(self._default_bindings)
- self.output_encoding = 'utf-8'
+ self.output_encoding = encoding
# default content
if not text:
@@ -146,9 +146,9 @@
self.output_encoding = 'utf-8'
else:
self.output_encoding = encoding
+ else:
+ encoding = self.output_encoding
- encoding = self.output_encoding
-
if not isinstance(text, unicode):
text = unicode(text, encoding)
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
