[Erp5-report] r17211 - in /erp5/trunk/products/ERP5OOo: ./ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Oct 26 23:11:36 2007
New Revision: 17211

URL: http://svn.erp5.org?rev=17211&view=rev
Log:
one semicolon is enough.

Modified:
    erp5/trunk/products/ERP5OOo/OOoTemplate.py
    erp5/trunk/products/ERP5OOo/OOoUtils.py
    erp5/trunk/products/ERP5OOo/tests/testDms.py

Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=17211&r1=17210&r2=17211&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py Fri Oct 26 23:11:36 2007
@@ -484,10 +484,10 @@
         return self._asFormat(ooo, format, request, batch_mode)
 
     if not format and not batch_mode:
-      request.RESPONSE.setHeader('Content-Type','%s;; charset=utf-8' % self.content_type)
+      request.RESPONSE.setHeader('Content-Type','%s; charset=utf-8' % self.content_type)
       request.RESPONSE.setHeader('Content-disposition', 'inline;filename=%s' % self.title_or_id())
     else:
-      request.RESPONSE.setHeader('Content-Type','%s;; charset=utf-8' % 'text/html')
+      request.RESPONSE.setHeader('Content-Type','%s; charset=utf-8' % 'text/html')
       request.RESPONSE.setHeader('Content-disposition', 'inline;filename=%s' % self.title_or_id())
         
     return ooo

Modified: erp5/trunk/products/ERP5OOo/OOoUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoUtils.py?rev=17211&r1=17210&r2=17211&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoUtils.py (original)
+++ erp5/trunk/products/ERP5OOo/OOoUtils.py Fri Oct 26 23:11:36 2007
@@ -153,7 +153,7 @@
       """ xmlns:tal='http://xml.zope.org/namespaces/tal'
           xmlns:i18n='http://xml.zope.org/namespaces/i18n'
           xmlns:metal='http://xml.zope.org/namespaces/metal'
-          tal:attributes='dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")'
+          tal:attributes='dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")'
          office:version='1.0'""")
 
   def addFileEntry(self, full_path, media_type, content=None):

Modified: erp5/trunk/products/ERP5OOo/tests/testDms.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testDms.py?rev=17211&r1=17210&r2=17211&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDms.py (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDms.py Fri Oct 26 23:11:36 2007
@@ -477,7 +477,7 @@
                       response.body)
     self.assertEquals('application/vnd.oasis.opendocument.spreadsheet',
                       response.headers['content-type'])
-    self.assertEquals('attachment;; filename="import_data_list.ods"',
+    self.assertEquals('attachment; filename="import_data_list.ods"',
                       response.headers['content-disposition'])
 
   def test_Member_download_pdf_format(self):
@@ -498,7 +498,7 @@
     response = self.publish('%s/Document_convert?format=pdf' % doc.getPath(),
                             basic='member_user2:secret')
     self.assertEquals('application/pdf', response.headers['content-type'])
-    self.assertEquals('attachment;; filename="import_data_list.pdf"',
+    self.assertEquals('attachment; filename="import_data_list.pdf"',
                       response.headers['content-disposition'])