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

[Stephan Richter]

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

Modified Files:
	testBrowserRequest.py 
Log Message:
Wrote some code that will convert form and cookie keys and values to
unicode, assuming an UTF-8 encoding. At some point we should probably find
a way to set the encoding based on a place. But this requires some more
serious infrastructure changes and should be discussed first. For now I am
happy that all the input is unicodefied.


=== Zope3/lib/python/Zope/Publisher/Browser/tests/testBrowserRequest.py 1.4 => 1.5 ===
             res,
             "Status: 200 Ok\r\n"
-            "Content-Length: 6\r\n"
+            "Content-Length: 7\r\n"
             "Content-Type: text/plain\r\n"
             "X-Powered-By: Zope (www.zope.org), Python (www.python.org)\r\n"
             "\r\n"
-            "'5', 6")
+            "u'5', 6")
 
     def testIPresentationRequest(self):
         ''' test the IView request'''
@@ -175,7 +175,7 @@
         response = request.getResponse()
         publish(request)
         self.assertEqual(request.form,
-                         {'a':'5', 'b':6})
+                         {u'a':u'5', u'b':6})
 
     def testFormListTypes(self):
         #extra = {'QUERY_STRING':'x.a:list:record=5&x.a:list:record=6'}
@@ -183,7 +183,7 @@
         request = self._createRequest(extra)
         response = request.getResponse()
         publish(request)
-        self.assertEqual(request.form, {'a':['5','6'], 'b':'1'})
+        self.assertEqual(request.form, {u'a':[u'5',u'6'], u'b':u'1'})
 
     def testFormListRecordTypes(self):
         extra = {'QUERY_STRING':'a.x:list:record=5&a.x:list:record=6&b=1'}
@@ -192,31 +192,31 @@
         publish(request)
         keys = request.form.keys()
         keys.sort()
-        self.assertEqual(keys, ['a','b'])
-        self.assertEqual(request.form['b'], '1')
-        self.assertEqual(request.form['a'].keys(), ['x'])
-        self.assertEqual(request.form['a']['x'], ['5','6'])
+        self.assertEqual(keys, [u'a',u'b'])
+        self.assertEqual(request.form[u'b'], u'1')
+        self.assertEqual(request.form[u'a'].keys(), [u'x'])
+        self.assertEqual(request.form[u'a'][u'x'], [u'5',u'6'])
 
     def testFormListTypes2(self):
         extra = {'QUERY_STRING':'a=5&a=6&b=1'}
         request = self._createRequest(extra)
         response = request.getResponse()
         publish(request)
-        self.assertEqual(request.form, {'a':['5','6'], 'b':'1'})
+        self.assertEqual(request.form, {'a':[u'5',u'6'], 'b':u'1'})
 
     def testFormDefaults(self):
         extra = {'QUERY_STRING':'a:default=10&a=6&b=1'}
         request = self._createRequest(extra)
         response = request.getResponse()
         publish(request)
-        self.assertEqual(request.form, {'a':'6', 'b':'1'})
+        self.assertEqual(request.form, {u'a':u'6', u'b':u'1'})
 
     def testFormDefaults2(self):
         extra = {'QUERY_STRING':'a:default=10&b=1'}
         request = self._createRequest(extra)
         response = request.getResponse()
         publish(request)
-        self.assertEqual(request.form, {'a':'10', 'b':'1'})
+        self.assertEqual(request.form, {u'a':u'10', u'b':u'1'})
 
 
 def test_suite():