[Zope-Checkins] CVS: Zope3/lib/python/Zope/Publisher/Browser/tests - testBrowserRequest.py:1.6

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/Publisher/Browser/tests
In directory cvs.zope.org:/tmp/cvs-serv18258/lib/python/Zope/Publisher/Browser/tests

Modified Files:
	testBrowserRequest.py 
Log Message:
Finished Zope 3 Unicode support. Zope 3 should now be able to handle all 
unicode formats. Note that ebcoding and decoding unicode strings is based
on the parameters we get from the browser in HTTP_ACCEPT_CHARSET.

All "text strings" (strings that represent human language text) internally 
in Zope 3 should be unicode strings from now on! I have not checked all of 
Zope 3, so if you see a non-unicode text string somewhere, please convert
it simply by putting 'u' before the string literal.

Note that binary data, such as images are not to be encoded. 

The encoding happens on the HTTPRequest/HTTPResponse abstraction level. 
That means that currenty FTP does not profit from this new code; however
FTP is always data anyhow.


=== Zope3/lib/python/Zope/Publisher/Browser/tests/testBrowserRequest.py 1.5 => 1.6 ===
 import unittest
 
+from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup 
+from Zope.ComponentArchitecture.GlobalAdapterService import provideAdapter 
+
+from Zope.I18n.IUserPreferredCharsets import IUserPreferredCharsets
+
+from Zope.Publisher.HTTP.HTTPRequest import IHTTPRequest
+from Zope.Publisher.HTTP.HTTPCharsets import HTTPCharsets
 from Zope.Publisher.Browser.BrowserRequest import BrowserRequest
 from Zope.Publisher.Browser.BrowserResponse import BrowserResponse
 
@@ -36,20 +43,24 @@
 
     
 
-class BrowserTests(HTTPTests):
+class BrowserTests(HTTPTests, PlacelessSetup):
 
     _testEnv =  {
-        'PATH_INFO':          '/folder/item',
-        'QUERY_STRING':       'a=5&b:int=6',
-        'SERVER_URL':         'http://foobar.com',
-        'HTTP_HOST':          'foobar.com',
-        'CONTENT_LENGTH':     '0',
-        'HTTP_AUTHORIZATION': 'Should be in accessible',
-        'GATEWAY_INTERFACE':  'TestFooInterface/1.0',
-        'HTTP_OFF_THE_WALL':  "Spam 'n eggs",
+        'PATH_INFO':           '/folder/item',
+        'QUERY_STRING':        'a=5&b:int=6',
+        'SERVER_URL':          'http://foobar.com',
+        'HTTP_HOST':           'foobar.com',
+        'CONTENT_LENGTH':      '0',
+        'HTTP_AUTHORIZATION':  'Should be in accessible',
+        'GATEWAY_INTERFACE':   'TestFooInterface/1.0',
+        'HTTP_OFF_THE_WALL':   "Spam 'n eggs",
+        'HTTP_ACCEPT_CHARSET': 'ISO-8859-1, UTF-8;q=0.66, UTF-16;q=0.33', 
     }
     
     def setUp(self):
+        PlacelessSetup.setUp(self)
+        provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)
+
         class AppRoot:
             " "
 
@@ -103,7 +114,7 @@
             res,
             "Status: 200 Ok\r\n"
             "Content-Length: 7\r\n"
-            "Content-Type: text/plain\r\n"
+            "Content-Type: text/plain;charset=UTF-8\r\n"
             "X-Powered-By: Zope (www.zope.org), Python (www.python.org)\r\n"
             "\r\n"
             "u'5', 6")