From aa2a9e479620a63f9fa5e48d61d84d27b678dc44 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sun, 8 Nov 2009 09:49:13 -0800 Subject: [PATCH] another attempt at utf-8 uploads. the last attempt broke uploads of binary files like .png R=r http://go/go-review/1026025 --- lib/codereview/codereview.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index f5ebc595e8..a8ba54025a 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -2137,14 +2137,14 @@ def EncodeMultipartFormData(fields, files): lines.append('--' + BOUNDARY) lines.append('Content-Disposition: form-data; name="%s"' % key) lines.append('') - if type(value) == str: - value = value.decode("utf-8") + if type(value) == unicode: + value = value.encode("utf-8") lines.append(value) for (key, filename, value) in files: - if type(filename) == str: - filename = filename.decode("utf-8") - if type(value) == str: - value = value.decode("utf-8") + if type(filename) == unicode: + filename = filename.encode("utf-8") + if type(value) == unicode: + value = value.encode("utf-8") lines.append('--' + BOUNDARY) lines.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename)) @@ -2155,7 +2155,7 @@ def EncodeMultipartFormData(fields, files): lines.append('') body = CRLF.join(lines) content_type = 'multipart/form-data; boundary=%s' % BOUNDARY - return content_type, body.encode("utf-8") + return content_type, body def GetContentType(filename): -- 2.50.0