Make the queue module work with both Python 2 and Python 3.

The module is called "Queue" in Python 2, and "queue" in Python 3. Use the
same try-ImportError check that's already present in some other files in
depot_tools to make both download_from_google_storage and
upload_to_google_storage work.

Bug: 1007872, 1009819
Change-Id: I8177cd251cbaf8313f41708036c4f36aa6d8bfe2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1859994
Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

tests/download_from_google_storage_unittest.py

@@ -10,7 +10,12 @@ from __future__ import print_function
 
 import optparse
 import os
-import Queue
+
+try:
+  import Queue as queue
+except ImportError:  # For Py3 compatibility
+  import queue
+
 import shutil
 import sys
 import tarfile
@@ -203,8 +208,8 @@ class DownloadTests(unittest.TestCase):
     shutil.copytree(self.checkout_test_files, self.base_path)
     self.base_url = 'gs://sometesturl'
     self.parser = optparse.OptionParser()
-    self.queue = Queue.Queue()
-    self.ret_codes = Queue.Queue()
+    self.queue = queue.Queue()
+    self.ret_codes = queue.Queue()
     self.lorem_ipsum = os.path.join(TEST_DIR, 'gstools', 'lorem_ipsum.txt')
     self.lorem_ipsum_sha1 = '7871c8e24da15bad8b0be2c36edc9dc77e37727f'
     self.maxDiff = None
@@ -245,7 +250,7 @@ class DownloadTests(unittest.TestCase):
         self.lorem_ipsum, output_filename))  # cp
     self.queue.put((sha1_hash, output_filename))
     self.queue.put((None, None))
-    stdout_queue = Queue.Queue()
+    stdout_queue = queue.Queue()
     download_from_google_storage._downloader_worker_thread(
         0, self.queue, False, self.base_url, self.gsutil,
         stdout_queue, self.ret_codes, True, False)
@@ -271,7 +276,7 @@ class DownloadTests(unittest.TestCase):
     output_filename = os.path.join(self.base_path, 'rootfolder_text.txt')
     self.queue.put((sha1_hash, output_filename))
     self.queue.put((None, None))
-    stdout_queue = Queue.Queue()
+    stdout_queue = queue.Queue()
     download_from_google_storage._downloader_worker_thread(
         0, self.queue, False, self.base_url, self.gsutil,
         stdout_queue, self.ret_codes, True, False)
@@ -291,7 +296,7 @@ class DownloadTests(unittest.TestCase):
     input_filename = '%s/%s' % (self.base_url, sha1_hash)
     self.queue.put((sha1_hash, output_filename))
     self.queue.put((None, None))
-    stdout_queue = Queue.Queue()
+    stdout_queue = queue.Queue()
     download_from_google_storage._downloader_worker_thread(
         0, self.queue, True, self.base_url, self.gsutil,
         stdout_queue, self.ret_codes, True, True, delete=False)
@@ -323,7 +328,7 @@ class DownloadTests(unittest.TestCase):
     output_filename = os.path.join(self.base_path, 'uploaded_lorem_ipsum.txt')
     self.queue.put((sha1_hash, output_filename))
     self.queue.put((None, None))
-    stdout_queue = Queue.Queue()
+    stdout_queue = queue.Queue()
     self.gsutil.add_expected(1, '', '')  # Return error when 'ls' is called.
     download_from_google_storage._downloader_worker_thread(
         0, self.queue, False, self.base_url, self.gsutil,
@@ -374,9 +379,9 @@ class DownloadTests(unittest.TestCase):
     self.assertEqual(code, 101)
 
   def test_corrupt_download(self):
-    q = Queue.Queue()
-    out_q = Queue.Queue()
-    ret_codes = Queue.Queue()
+    q = queue.Queue()
+    out_q = queue.Queue()
+    ret_codes = queue.Queue()
     tmp_dir = tempfile.mkdtemp()
     sha1_hash = '7871c8e24da15bad8b0be2c36edc9dc77e37727f'
     output_filename = os.path.join(tmp_dir, 'lorem_ipsum.txt')

tests/upload_to_google_storage_unittest.py

@@ -7,7 +7,12 @@
 
 import optparse
 import os
-import Queue
+
+try:
+  import Queue as queue
+except ImportError:  # For Py3 compatibility
+  import queue
+
 import shutil
 import StringIO
 import sys
@@ -37,8 +42,8 @@ class UploadTests(unittest.TestCase):
     shutil.copytree(os.path.join(TEST_DIR, 'gstools'), self.base_path)
     self.base_url = 'gs://sometesturl'
     self.parser = optparse.OptionParser()
-    self.ret_codes = Queue.Queue()
-    self.stdout_queue = Queue.Queue()
+    self.ret_codes = queue.Queue()
+    self.stdout_queue = queue.Queue()
     self.lorem_ipsum = os.path.join(self.base_path, 'lorem_ipsum.txt')
     self.lorem_ipsum_sha1 = '7871c8e24da15bad8b0be2c36edc9dc77e37727f'
 
@@ -111,7 +116,7 @@ class UploadTests(unittest.TestCase):
     self.assertEqual(code, 0)
 
   def test_upload_worker_errors(self):
-    work_queue = Queue.Queue()
+    work_queue = queue.Queue()
     work_queue.put((self.lorem_ipsum, self.lorem_ipsum_sha1))
     work_queue.put((None, None))
     self.gsutil.add_expected(1, '', '')  # For the first ls call.

upload_to_google_storage.py

@@ -10,7 +10,12 @@ from __future__ import print_function
 import hashlib
 import optparse
 import os
-import Queue
+
+try:
+  import Queue as queue
+except ImportError:  # For Py3 compatibility
+  import queue
+
 import re
 import stat
 import sys
@@ -142,11 +147,11 @@ def upload_to_google_storage(
 
   # Start up all the worker threads plus the printer thread.
   all_threads = []
-  ret_codes = Queue.Queue()
+  ret_codes = queue.Queue()
   ret_codes.put((0, None))
-  upload_queue = Queue.Queue()
+  upload_queue = queue.Queue()
   upload_timer = time.time()
-  stdout_queue = Queue.Queue()
+  stdout_queue = queue.Queue()
   printer_thread = PrinterThread(stdout_queue)
   printer_thread.daemon = True
   printer_thread.start()