Changeset 3974

Timestamp:

01/18/08 17:26:24 (7 months ago)

Author:

faide

Message:

remove the re-encoding from the VisitFilter?. A test still fails but when I test it manually in a project I confirm I have unicode objects from the params.

Files:

• branches/1.0/turbogears/identity/tests/test_identity.py (modified) (4 diffs)
• branches/1.0/turbogears/visit/api.py (modified) (1 diff)

branches/1.0/turbogears/identity/tests/test_identity.py

@@ -124 +124 @@
-        decode = formencode.variabledecode.variable_decode
-        params = decode(dict([p.split('=') for p in params.split('&')]))
+
-        if params == cherrypy.request.params:
-            return 'params ok'
@@ -129 +130 @@
-            return 'wrong params: %s\nexpected: %s' % (
-                params, cherrypy.request.params)
+
-    test_params = turbogears.expose()(test_params)
-    test_params = identity.require(identity.not_anonymous())(test_params)
@@ -459 +461 @@
-        assert 'identity_failed' in firstline, firstline
-
-
-
+_whenidfails
+\
-        variables and Identity"""
-        params = urllib.quote(IdentityRoot._test_params.decode('utf-8').encode('latin-1'), '=&')
@@ -466 +468 @@
-        firstline = cherrypy.response.body[0]
-        assert 'identity_failed_answer' in firstline, firstline
+
+    def test_decode_filter_whenidworks(self):
+        """Test that the decode filter doesn't break with nested\
+        variables and Identity"""
+        params = urllib.quote(IdentityRoot._test_params.decode('utf-8').encode('latin-1'), '=&')
-        params += '&user_name=samIam&password=secret&login=Login'
-        testutil.create_request('/test_params?' + params)

branches/1.0/turbogears/visit/api.py

@@ -247 +247 @@
-            cherrypy.request.object_path = e.path
-
-        def encode_utf8(value):
-            '''
-            recursively encode all values in a dictionary to utf-8
-            '''
-            if isinstance(value, dict):
-                for k, v in value.items():
-                    value[k] = encode_utf8(v)
-            elif isinstance(value, list):
-                return map(encode_utf8, value)
-            elif isinstance(value, unicode):
-                return value.encode('utf-8')
-            return value
-
-        encode_utf8(cherrypy.request.params)
-
-    def _generate_key(self):
-        '''