Changeset 87321 in webkit

Timestamp:

May 25, 2011 2:33:15 PM (13 years ago)

Author:

tony@chromium.org

Message:

2011-05-25 Tony Chang <​tony@chromium.org>

Reviewed by Adam Barth.

webkitpy's NetworkTransaction shouldn't use mechanize
​https://bugs.webkit.org/show_bug.cgi?id=61450

mechanize.HTTPError is just an alias for urllib2.HTTPError, so
use urllib2 directly. Re-add NetworkTransaction to
test_results_uploader.py (reverting r87124).

• Scripts/webkitpy/common/net/networktransaction.py:
• Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/networktransaction.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-25  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        webkitpy's NetworkTransaction shouldn't use mechanize
+        https://bugs.webkit.org/show_bug.cgi?id=61450
+
+        mechanize.HTTPError is just an alias for urllib2.HTTPError, so
+        use urllib2 directly.  Re-add NetworkTransaction to
+        test_results_uploader.py (reverting r87124).
+
+        * Scripts/webkitpy/common/net/networktransaction.py:
+        * Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py:
+
 2011-05-25  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Tools/Scripts/webkitpy/common/net/networktransaction.py

@@ -29 +29 @@
 import logging
 import time
+import urllib2
 
 from webkitpy.common.system.deprecated_logging import log
@@ -50 +51 @@
         self._total_sleep = 0
         self._backoff_seconds = self._initial_backoff_seconds
-        from webkitpy.thirdparty.autoinstalled import mechanize
         while True:
             try:
                 return request()
-            # FIXME: We should catch urllib2.HTTPError here too.
-            except mechanize.HTTPError, e:
+            except urllib2.HTTPError, e:
                 if self._convert_404_to_None and e.code == 404:
                     return None

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py

@@ -34 +34 @@
 import socket
 import urllib2
+
+from webkitpy.common.net.networktransaction import NetworkTransaction
 
 def get_mime_type(filename):
@@ -100 +102 @@
         try:
             socket.setdefaulttimeout(timeout_seconds)
-            self._upload_files(params, file_objs)
+            NetworkTransaction(timeout_seconds=timeout_seconds).run(
+                lambda: self._upload_files(params, file_objs))
         finally:
             socket.setdefaulttimeout(orig_timeout)