All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

Any updates on this? pretty trivial change...

I've imported this change internally, but our linters are pretty unhappy about imports "not at top of file". We seem to be doing this in other places so I think I can work around it.

looks like this is causing the //tools/android:build_incremental_dexmanifest_test test to fail:

tools/android/build_incremental_dexmanifest.py", line 55, in __init__
    self.queue = Queue()
TypeError: 'module' object is not callable

(and also causing 2 internal tests to fail with the same error)

Looks like this is because the original code from queue import Queue imports the Queue class from the module queue, whereas in the except block, the code import queue as Queue imports the module with the name "Queue".

Are these the 3 scenarios?

1. from queue import Queue (original. Queue class in queue module)
2. from Queue import Queue (Queue class is is Queue module)
3. import Queue (import just module, module is callable to produce Queue object)

At least on my Linux machine, scenario 3 doesn't seem to work. There appears to be both queue and Queue in python2, just queue in python3, and the module isn't callable in any of the cases. I think queue in python2 is from a compatibility package:

>>> print(queue.__file__)
/usr/lib/python2.7/dist-packages/queue/__init__.pyc

So unless something is different on macos, seems this change should be:

try:
  # python2 without compatibility package
  from Queue import Queue
except ImportError:
  # python3
  from queue import Queue

@ahumesky yeah you are right. It's a bit confusing but according to the python doc:

python 2 uses Queue module name and the creation of object is Queue.Queue()
https://docs.python.org/2.7/library/queue.html

python 3 uses queue module name and the creation of object is queue.Queue()
https://docs.python.org/3.8/library/queue.html

so the import syntax should be

try:
  # python2 without compatibility package
  from Queue import Queue
except ImportError:
  # python3
  from queue import Queue

@ahumesky is this good to go?