[Zope-Checkins] SVN: Zope/trunk/src/ Merged r106105:106106 from 2.12 branch

Sun Nov 29 14:59:46 EST 2009

Log message for revision 106107:
  Merged r106105:106106 from 2.12 branch
  

Changed:
  U   Zope/trunk/src/App/dtml/manage_page_header.dtml
  U   Zope/trunk/src/Products/PageTemplates/tests/testZopePageTemplate.py

-=-
Modified: Zope/trunk/src/App/dtml/manage_page_header.dtml
===================================================================

--- Zope/trunk/src/App/dtml/manage_page_header.dtml	2009-11-29 19:57:01 UTC (rev 106106)
+++ Zope/trunk/src/App/dtml/manage_page_header.dtml	2009-11-29 19:59:46 UTC (rev 106107)
@@ -2,7 +2,7 @@
 <html>
 <head>
 <dtml-unless management_page_charset>
-<dtml-call "REQUEST.set('management_page_charset','iso-8859-1')">
+<dtml-call "REQUEST.set('management_page_charset','utf-8')">
 </dtml-unless>
 <meta http-equiv="content-type" content="text/html;charset=&dtml-management_page_charset;" />
 <dtml-call "RESPONSE.setHeader('content-type','text/html;charset='+management_page_charset)">

Modified: Zope/trunk/src/Products/PageTemplates/tests/testZopePageTemplate.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/tests/testZopePageTemplate.py	2009-11-29 19:57:01 UTC (rev 106106)
+++ Zope/trunk/src/Products/PageTemplates/tests/testZopePageTemplate.py	2009-11-29 19:59:46 UTC (rev 106107)
@@ -337,7 +337,7 @@
         zpt = self._put(html_with_upper_attr)
         self.content_type = 'text/html'
         result = zpt.pt_render()
-     	self.assertEqual('ATTR' in result, False)		
+        self.assertEqual('ATTR' in result, False)
 
 class PreferredCharsetUnicodeResolverTests(unittest.TestCase):
 

