Changeset 1166

Timestamp:

06/27/06 21:40:37

Author:

fumanchu

Message:

Added support for RFC 2047 encoding and decoding of header values.

Files:

• trunk/cherrypy/_cprequest.py (modified) (2 diffs)
• trunk/cherrypy/lib/http.py (modified) (4 diffs)
• trunk/cherrypy/test/test_core.py (modified) (2 diffs)

trunk/cherrypy/_cprequest.py

@@ -275 +275 @@
-        for name, value in self.header_list:
-            value = value.strip()
+            
-            # Warning: if there is more than one header entry for cookies (AFAIK,
-            # only Konqueror does that), only the last one will remain in headers
-            # (but they will be correctly stored in request.simple_cookie).
-value
+http.decode_TEXT(value)
-            
-            # Handle cookies differently because on Konqueror, multiple
@@ -688 +689 @@
-                name, value = line.split(": ", 1)
-                self.header_list.append((name, value))
+        
+        self.header_list = [(k, http.encode_TEXT(v)) for k, v in self.header_list]

trunk/cherrypy/lib/http.py

@@ -21 +21 @@
-
-import cgi
+from email.Header import Header, decode_header
-import re
-import rfc822
@@ -97 +98 @@
-        self.params = params
-    
+    def __unicode__(self):
+        p = [";%s=%s" % (k, v) for k, v in self.params.iteritems()]
+        return u"%s%s" % (self.value, "".join(p))
+    
-    def __str__(self):
-
-
+
-    
-    def parse(elementstr):
@@ -180 +184 @@
-    return result
-
+def encode_TEXT(value):
+    """Encode RFC-2047 TEXT (e.g. u"\u8200" -> "=?utf-8?b?6IiA?=")."""
+    try:
+        value = value.encode("iso-8859-1")
+    except UnicodeEncodeError:
+        value = value.encode("utf-8")
+        value = Header(value, 'utf-8').encode()
+    return value
+
+def decode_TEXT(value):
+    """Decode RFC-2047 TEXT (e.g. "=?utf-8?q?f=C3=BCr?=" -> u"f\xfcr")."""
+    atoms = decode_header(value)
+    decodedvalue = ""
+    for atom, charset in atoms:
+        if charset is not None:
+            atom = atom.decode(charset)
+        decodedvalue += atom
+    return decodedvalue
-
-def validStatus(status):
@@ -382 +404 @@
-                valueList = [valueList]
-            for value in valueList:
-str
+unicode
-        header_list.sort()
-        return [item[1] for item in header_list]

trunk/cherrypy/test/test_core.py

@@ -277 +277 @@
-            
-            return "double header test"
-
-
+
+
+
+
+
+
+
-    class HeaderElements(Test):
-        
-        def get_elements(self, headername):
-            e = cherrypy.request.headers.elements(headername)
-str
+unicode
-    
-    
@@ -743 +748 @@
-                    'Expires', 'Location', 'Server']:
-            self.assertEqual(hnames.count(key), 1)
+        
+        # Test RFC-2047-encoded request and response header values
+        self.getPage("/headers/ifmatch",
+                     [('If-Match', '=?utf-8?q?=E2=84=ABngstr=C3=B6m?=')])
+        self.assertHeader("ETag", '=?utf-8?b?4oSrbmdzdHLDtm0=?=')
+        self.assertBody("u'\\u212bngstr\\xf6m'")
-    
-    def testHTTPMethods(self):