Title: [87321] trunk/Tools
- Revision
- 87321
- Author
- [email protected]
- Date
- 2011-05-25 14:33:15 -0700 (Wed, 25 May 2011)
Log Message
2011-05-25 Tony Chang <[email protected]>
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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (87320 => 87321)
--- trunk/Tools/ChangeLog 2011-05-25 21:31:37 UTC (rev 87320)
+++ trunk/Tools/ChangeLog 2011-05-25 21:33:15 UTC (rev 87321)
@@ -1,3 +1,17 @@
+2011-05-25 Tony Chang <[email protected]>
+
+ 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 <[email protected]>
[Chromium] Unreviewed build fix. Do not define WTF/JS_EXPORT_PRIVATE to JS_EXPORTDATA
Modified: trunk/Tools/Scripts/webkitpy/common/net/networktransaction.py (87320 => 87321)
--- trunk/Tools/Scripts/webkitpy/common/net/networktransaction.py 2011-05-25 21:31:37 UTC (rev 87320)
+++ trunk/Tools/Scripts/webkitpy/common/net/networktransaction.py 2011-05-25 21:33:15 UTC (rev 87321)
@@ -28,6 +28,7 @@
import logging
import time
+import urllib2
from webkitpy.common.system.deprecated_logging import log
@@ -49,12 +50,10 @@
def run(self, request):
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
self._check_for_timeout()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py (87320 => 87321)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py 2011-05-25 21:31:37 UTC (rev 87320)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py 2011-05-25 21:33:15 UTC (rev 87321)
@@ -34,6 +34,8 @@
import socket
import urllib2
+from webkitpy.common.net.networktransaction import NetworkTransaction
+
def get_mime_type(filename):
return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
@@ -99,6 +101,7 @@
orig_timeout = socket.getdefaulttimeout()
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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
