write() now auto-converts to unicode instead of throwing an exception

lib/python/Products/PageTemplates/ZopePageTemplate.py

@@ -108,7 +108,6 @@ class ZopePageTemplate(Script, PageTemplate, Historical, Cacheable,
         self.expand = 0                                                               
         self.ZBindings_edit(self._default_bindings)
         self.output_encoding = output_encoding
-
         # default content
         if not text:
             text = open(self._default_content_fn).read()
@@ -286,8 +285,11 @@ class ZopePageTemplate(Script, PageTemplate, Historical, Cacheable,
         return c
 
     def write(self, text):
+
         if not isinstance(text, unicode):
-            raise TypeError("'text' parameter must be unicode")
+            text, encoding = convertToUnicode(text, self.content_type, preferred_encodings)
+            self.output_encoding = encoding
+
         self.ZCacheable_invalidate()
         ZopePageTemplate.inheritedAttribute('write')(self, text)
 

lib/python/Products/PageTemplates/tests/testZopePageTemplate.py

@@ -112,11 +112,6 @@ class ZopePageTemplateFileTests(ZopeTestCase):
         self.assertEqual(zpt.read(), s)
         self.assertEqual(isinstance(zpt.read(), unicode), True)
 
-    def testWriteWontAcceptsNonUnicode(self):
-        manage_addPageTemplate(self.app, 'test', '', encoding='utf-8')
-        zpt = self.app['test']
-        self.assertRaises(TypeError, zpt.write, 'this is not unicode')
-
 
     def _createZPT(self):
         manage_addPageTemplate(self.app, 'test', text=utf8_str, encoding='utf-8')