Another build fix attempt after r105543.

* Scripts/webkitpy/common/net/file_uploader.py:
(FileUploader.upload_as_multipart_form_data):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@105759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index eb84d4399038b9f3b5bc63d398ae5c7dfd09cf72..28295e924a0aa63f1ef51399df5b3f196ad3b0ee 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-24  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Another build fix attempt after r105543.
+
+        * Scripts/webkitpy/common/net/file_uploader.py:
+        (FileUploader.upload_as_multipart_form_data):
+
 2012-01-24  Ryosuke Niwa  <rniwa@webkit.org>
 
         Build fix attempt after r105543.

diff --git a/Tools/Scripts/webkitpy/common/net/file_uploader.py b/Tools/Scripts/webkitpy/common/net/file_uploader.py
index 79dcb28515904d00feca6a075e50dd37565f9fe8..aa3488bbf029bf8cae49bb3429846f22d48a34c0 100644 (file)
--- a/Tools/Scripts/webkitpy/common/net/file_uploader.py
+++ b/Tools/Scripts/webkitpy/common/net/file_uploader.py
@@ -95,7 +95,8 @@ class FileUploader(object):
         file_objs = []
         for filename, path in files:
             # FIXME: We should talk to the filesytem via a Host object.
-            file_objs.append(('file', filename, filesystem.read_text_file(filename)))
+            with codecs.open(path, "rb") as file:
+                file_objs.append(('file', filename, file.read()))
 
         # FIXME: We should use the same variable names for the formal and actual parameters.
         content_type, data = _encode_multipart_form_data(attrs, file_objs)