cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10692 from ianzd/python3

Browse source 
Import queue from six.moves for python3 compatibility.
This commit is contained in:
Toshio Kuratomi 2015-04-13 14:26:40 -07:00
commit c486b6773a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
v2/ansible/executor/process/result.py
View file

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

4
v2/ansible/executor/process/worker.py
View file

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