Revert "[autotest] Loop over urllib2 reads of the RPC responses."
This reverts commit 9344c8078ad968e6f062d3ec4849be2f31739b92.
This change is debug code that's no longer needed.
BUG=chromium:606071
TEST=None
Change-Id: I0af49ccf71af11b17cfcbe56be4c069ae582c482
Reviewed-on: https://chromium-review.googlesource.com/347517
Commit-Ready: Richard Barnette <jrbarnette@google.com>
Tested-by: Richard Barnette <jrbarnette@google.com>
Reviewed-by: Simran Basi <sbasi@chromium.org>
diff --git a/frontend/afe/json_rpc/proxy.py b/frontend/afe/json_rpc/proxy.py
index 3d0325d..1e1df4c 100644
--- a/frontend/afe/json_rpc/proxy.py
+++ b/frontend/afe/json_rpc/proxy.py
@@ -19,7 +19,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-import logging
import os
import socket
import urllib2
@@ -112,20 +111,10 @@
default_timeout = socket.getdefaulttimeout()
if not default_timeout:
# If default timeout is None, socket will never time out.
- urlfile = urllib2.urlopen(request)
+ respdata = urllib2.urlopen(request).read()
else:
timeout = max(min_rpc_timeout, default_timeout)
- urlfile = urllib2.urlopen(request, timeout=timeout)
- # Keep calling read on the urlfile to ensure all bytes are received.
- respdata = b''
- chunk = urlfile.read()
- while len(chunk) != 0:
- respdata += chunk
- chunk = urlfile.read()
- # TODO (sbasi): crbug.com/606071 Remove logging once json decode
- # errors stop occuring.
- if len(chunk) != 0:
- logging.debug('Proxy required multiple reads to receive data.')
+ respdata = urllib2.urlopen(request, timeout=timeout).read()
try:
resp = decoder.JSONDecoder().decode(respdata)
except ValueError: