diff --git a/gsutil.py b/gsutil.py index d383fa7e0..cd1607824 100755 --- a/gsutil.py +++ b/gsutil.py @@ -7,15 +7,15 @@ import argparse -import shutil -import zipfile -import hashlib import base64 -import os -import sys +import hashlib import json -import urllib +import os +import shutil import subprocess +import sys +import urllib2 +import zipfile GSUTIL_URL = 'https://storage.googleapis.com/pub/' @@ -67,7 +67,7 @@ def download_gsutil(version, target_dir): 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: @@ -76,7 +76,7 @@ def download_gsutil(version, target_dir): # 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) diff --git a/tests/gsutil_test.py b/tests/gsutil_test.py index f81524320..30648279d 100755 --- a/tests/gsutil_test.py +++ b/tests/gsutil_test.py @@ -16,7 +16,7 @@ import base64 import tempfile import json import os -import urllib +import urllib2 # Add depot_tools to path @@ -71,15 +71,15 @@ 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):