[Erp5-report] r31546 leonardo - /erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Wed Dec 30 20:00:14 2009
New Revision: 31546

URL: http://svn.erp5.org?rev=31546&view=rev
Log:
flag utf-8 support in the request, required for proper functioning of the zpt unicode conflict resolver in Zope 2.12

Modified:
    erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=31546&r1=31545&r2=31546&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Wed Dec 30 20:00:14 2009
@@ -300,6 +300,15 @@
       return portal
 
     getPortalObject = getPortal
+
+    def _app(self):
+      '''Opens a ZODB connection and returns the app object.
+      
+      We override it to patch HTTP_ACCEPT_CHARSET into REQUEST to get the zpt
+      unicode conflict resolver to work properly'''
+      app = PortalTestCase._app(self)
+      app.REQUEST['HTTP_ACCEPT_CHARSET'] = 'utf-8'
+      return app
 
     def enableLightInstall(self):
       """
@@ -1035,6 +1044,7 @@
 
         env['SERVER_NAME'] = request['SERVER_NAME']
         env['SERVER_PORT'] = request['SERVER_PORT']
+        env['HTTP_ACCEPT_CHARSET'] = request['HTTP_ACCEPT_CHARSET']
         env['REQUEST_METHOD'] = request_method
 
         p = path.split('?')