Changeset 1306

Timestamp:

09/01/06 11:46:53

Author:

fumanchu

Message:

No need to encode a string twice. :/

Files:

• trunk/cherrypy/lib/http.py (modified) (1 diff)

trunk/cherrypy/lib/http.py

@@ -347 +347 @@
-            for v in value:
-                if isinstance(v, unicode):
-
+
+
+
+
+
-                    try:
-                        v = v.encode("iso-8859-1")
-                    except UnicodeEncodeError:
-                        # HTTP/1.0 says, "Words of *TEXT may contain octets
-                        # from character sets other than US-ASCII." and
-                        # "Recipients of header field TEXT containing octets
-                        # outside the US-ASCII character set may assume that
-                        # they represent ISO-8859-1 characters."
-                        if protocol >= (1, 1):
-
+
+
-                            v = Header(v, 'utf-8').encode()
-                        else: