[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/tests/test_FSFile.py Defend against changed behavior of zope.contenttype 3.4.2 vs. 3.5.1.

Tres Seaver tseaver at palladion.com
Wed Mar 31 13:50:02 EDT 2010


Log message for revision 110375:
  Defend against changed behavior of zope.contenttype 3.4.2 vs. 3.5.1.

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_FSFile.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_FSFile.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_FSFile.py	2010-03-31 17:28:04 UTC (rev 110374)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_FSFile.py	2010-03-31 17:50:01 UTC (rev 110375)
@@ -225,12 +225,14 @@
                         , rfc1123_date( mod_time ) )
 
     def test_utf8charset_detection( self ):
+        import mimetypes
         file_name = 'testUtf8.js'
+        mtype, ignore_enc = mimetypes.guess_type(file_name)
         file = self._makeOne(file_name, file_name)
         file = file.__of__(self.root)
         data = file.index_html(self.REQUEST, self.RESPONSE)
         self.assertEqual(self.RESPONSE.getHeader('content-type'),
-                         'application/javascript; charset=utf-8')
+                         '%s; charset=utf-8' % mtype)
 
     def test_unnecessary_invalidation_avoidance(self):
         # See https://bugs.launchpad.net/zope-cmf/+bug/325246



More information about the checkins mailing list