Import queue from six.moves for python3 compatibility.

pull/10692/head
Ian Dotson 10 years ago
parent d85f97ccfd
commit 6e12117b04

@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import Queue
from six.moves import queue
import multiprocessing
import os
import signal
@ -77,7 +77,7 @@ class ResultProcess(multiprocessing.Process):
result = rslt_q.get(block=False)
debug("got a result from worker %d: %s" % (self._cur_worker, result))
break
except Queue.Empty:
except queue.Empty:
pass
if self._cur_worker == starting_point:
@ -164,7 +164,7 @@ class ResultProcess(multiprocessing.Process):
if result._task.register:
self._send_result(('set_host_var', result._host, result._task.register, result._result))
except Queue.Empty:
except queue.Empty:
pass
except (KeyboardInterrupt, IOError, EOFError):
break

@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import Queue
from six.moves import queue
import multiprocessing
import os
import signal
@ -130,7 +130,7 @@ class WorkerProcess(multiprocessing.Process):
else:
time.sleep(0.1)
except Queue.Empty:
except queue.Empty:
pass
except (IOError, EOFError, KeyboardInterrupt):
break

Loading…
Cancel
Save