summaryrefslogtreecommitdiff
path: root/lib/parallel.py
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2013-10-17 17:17:22 -0400
committerMike Frysinger <vapier@chromium.org>2013-10-19 00:45:08 +0000
commit16cf2c6c20a57041151ccfa76a1b9494672a910a (patch)
treeab3f328fe02288afbe69702c3bec43fba366c15c /lib/parallel.py
parent60890af4f79554d95afdf2b8b698a87f232263ad (diff)
downloadchromite-16cf2c6c20a57041151ccfa76a1b9494672a910a.tar.gz
parallel: support python-3 with the queue module
This doesn't really impact us today, but I'm trying to use this module in other projects, and those want python-3 compatibility. BUG=None TEST=`./parallel_unittest.py` Change-Id: If951831a57d3a6b64acaf42f1006cfff313126ef Reviewed-on: https://chromium-review.googlesource.com/173610 Reviewed-by: David James <davidjames@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'lib/parallel.py')
-rw-r--r--lib/parallel.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/parallel.py b/lib/parallel.py
index 5ec7a1af6..ed13df4fd 100644
--- a/lib/parallel.py
+++ b/lib/parallel.py
@@ -11,7 +11,13 @@ import functools
import logging
import multiprocessing
import os
-import Queue
+try:
+ import Queue
+except ImportError:
+ # Python-3 renamed to "queue". We still use Queue to avoid collisions
+ # with naming variables as "queue". Maybe we'll transition at some point.
+ # pylint: disable=F0401
+ import queue as Queue
import signal
import sys
import tempfile