[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0fff89136d84c0d8f6edbf235afbd4ae3319932f
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 23:39:29 2010 +0000

    2010-11-23  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Tony Chang.
    
            remove timeout argument to urlopen
            https://bugs.webkit.org/show_bug.cgi?id=49995
    
            Apparently the version of python we have on the bots doesn't accept a timeout argument.
    
            * Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72636 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 605ea38..6a08f8a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-23  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        remove timeout argument to urlopen
+        https://bugs.webkit.org/show_bug.cgi?id=49995
+
+        Apparently the version of python we have on the bots doesn't accept a timeout argument.
+
+        * Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py:
+
 2010-11-23  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r72628.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py
index 4921afd..033c8c6 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py
@@ -90,7 +90,7 @@ class TestResultsUploader:
         content_type, data = _encode_multipart_form_data(attrs, file_objs)
         headers = {"Content-Type": content_type}
         request = urllib2.Request(url, data, headers)
-        urllib2.urlopen(request, timeout=60)
+        urllib2.urlopen(request)
 
     def upload(self, params, files, timeout_seconds):
         file_objs = []

-- 
WebKit Debian packaging