[Findit] Improve output format and cherry-pick bugs fix.

tools/findit/common/http_client_local.py

 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 A http client with support for https connections with certificate verification.
 
 The verification is based on http://tools.ietf.org/html/rfc6125#section-6.4.3
 and the code is from Lib/ssl.py in python3:
   http://hg.python.org/cpython/file/4dac45f88d45/Lib/ssl.py
@@ skipping 187 matching lines @@
     # to a man in the middle.
     handlers.append(HTTPSHandler())
 
 
   cookie_file = os.environ.get('COOKIE_FILE')
   if cookie_file and os.path.exists(cookie_file):
     handlers.append(
         urllib2.HTTPCookieProcessor(cookielib.MozillaCookieJar(cookie_file)))
 
   url_opener = urllib2.build_opener(*handlers)
-  if timeout is not None:
-    response = url_opener.open(url, timeout=timeout)
-  else:
-    response = url_opener.open(url)
-  return response.code, response.read()
+
+  status_code = None
+  content = None
+
+  try:
+    if timeout is not None:

[aarya, 2014/08/26 19:01:23]

None timeout is just ignored, i dont think you need if-else

[stgao, 2014/08/26 20:30:47]

Nice. That makes the code cleaner.

+      response = url_opener.open(url, timeout=timeout)
+    else:
+      response = url_opener.open(url)
+
+    status_code = response.code
+    content = response.read()
+  except urllib2.HTTPError as e:
+    status_code = e.code
+    content = None
+
+  return status_code, content
 
 
 class HttpClientLocal(http_client.HttpClient):
   """This http client is used locally in a workstation, GCE VMs, etc."""
 
   @staticmethod
   def Get(url, params={}, timeout=None):
     if params:
       url = '%s?%s' % (url, urllib.urlencode(params))
     return _SendRequest(url, timeout=timeout)