gsutil: Use urllib2 instead of urllib.

tests/gsutil_test.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.
 
 """Test gsutil.py."""
 
 
 import __builtin__
 import unittest
 import hashlib
 import zipfile
 import shutil
 import sys
 import base64
 import tempfile
 import json
 import os
-import urllib
+import urllib2
 
 
 # Add depot_tools to path
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 DEPOT_TOOLS_DIR = os.path.dirname(THIS_DIR)
 sys.path.append(DEPOT_TOOLS_DIR)
 
 import gsutil
 
 
@@ skipping 34 matching lines @@
       raise TestError(message)
     if isinstance(exp_returns, Exception):
       raise exp_returns
     return exp_returns
 
 
 class GsutilUnitTests(unittest.TestCase):
   def setUp(self):
     self.fake = FakeCall()
     self.tempdir = tempfile.mkdtemp()
-    self.old_urlopen = getattr(urllib, 'urlopen')
+    self.old_urlopen = getattr(urllib2, 'urlopen')
     self.old_call = getattr(gsutil, 'call')
-    setattr(urllib, 'urlopen', self.fake)
+    setattr(urllib2, 'urlopen', self.fake)
     setattr(gsutil, 'call', self.fake)
 
   def tearDown(self):
     self.assertEqual(self.fake.expectations, [])
     shutil.rmtree(self.tempdir)
-    setattr(urllib, 'urlopen', self.old_urlopen)
+    setattr(urllib2, 'urlopen', self.old_urlopen)
     setattr(gsutil, 'call', self.old_call)
 
   def test_download_gsutil(self):
     version = '4.2'
     filename = 'gsutil_%s.zip' % version
     full_filename = os.path.join(self.tempdir, filename)
     fake_file = 'This is gsutil.zip'
     fake_file2 = 'This is other gsutil.zip'
     url = '%s%s' % (gsutil.GSUTIL_URL, filename)
     self.fake.add_expectation(url, _returns=Buffer(fake_file))
@@ skipping 69 matching lines @@
     self.fake.add_expectation(
         [sys.executable, gsutil_bin, 'version'], verbose=False, _returns=True)
 
     with open(gsutil_bin, 'w') as f:
       f.write('Foobar')
     self.assertEquals(
         gsutil.ensure_gsutil(version, self.tempdir), gsutil_bin)
 
 if __name__ == '__main__':
   unittest.main()