gsutil: Use urllib2 instead of urllib.

gsutil.py

 #!/usr/bin/env python
 # Copyright 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.
 
 """Run a pinned gsutil."""
 
 
 import argparse

[M-A Ruel, 2014/12/17 16:01:45]

Ugh, can you sort the list while at it? Thanks.

 import shutil
 import zipfile
 import hashlib
 import base64
 import os
 import sys
 import json
-import urllib
+import urllib2
 import subprocess
 
 
 GSUTIL_URL = 'https://storage.googleapis.com/pub/'
 API_URL = 'https://www.googleapis.com/storage/v1/b/pub/o/'
 
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 DEFAULT_BIN_DIR = os.path.join(THIS_DIR, 'external_bin', 'gsutil')
 DEFAULT_FALLBACK_GSUTIL = os.path.join(
     THIS_DIR, 'third_party', 'gsutil', 'gsutil')
@@ skipping 32 matching lines @@
     md5_calc = hashlib.md5()
     with open(target_filename, 'rb') as f:
       while True:
         buf = f.read(4096)
         if not buf:
           break
         md5_calc.update(buf)
     local_md5 = md5_calc.hexdigest()
 
     metadata_url = '%s%s' % (API_URL, filename)
-    metadata = json.load(urllib.urlopen(metadata_url))
+    metadata = json.load(urllib2.urlopen(metadata_url))
     remote_md5 = base64.b64decode(metadata['md5Hash'])
 
     if local_md5 == remote_md5:
       return target_filename
     os.remove(target_filename)
 
   # Do the download.
   url = '%s%s' % (GSUTIL_URL, filename)
-  u = urllib.urlopen(url)
+  u = urllib2.urlopen(url)
   with open(target_filename, 'wb') as f:
     while True:
       buf = u.read(4096)
       if not buf:
         break
       f.write(buf)
   return target_filename
 
 
 def check_gsutil(gsutil_bin):
@@ skipping 48 matching lines @@
   args = parser.parse_args()
   return args.force_version, args.fallback, args.target, args.args
 
 
 def main():
   force_version, fallback, target, args = parse_args()
   run_gsutil(force_version, fallback, target, args)
 
 if __name__ == '__main__':
   sys.exit(main())