Commit 82aa2010 authored by Benjamin Peterson's avatar Benjamin Peterson

patch up multiprocessing until it's API can be changed too

parent d810626f
...@@ -54,10 +54,10 @@ class DummyProcess(threading.Thread): ...@@ -54,10 +54,10 @@ class DummyProcess(threading.Thread):
return None return None
is_alive = threading.Thread.is_alive.im_func is_alive = threading.Thread.is_alive.im_func
get_name = threading.Thread.get_name.im_func get_name = threading.Thread.getName.im_func
set_name = threading.Thread.set_name.im_func set_name = threading.Thread.setName.im_func
is_daemon = threading.Thread.is_daemon.im_func is_daemon = threading.Thread.isDaemon.im_func
set_daemon = threading.Thread.set_daemon.im_func set_daemon = threading.Thread.setDaemon.im_func
# #
# #
......
...@@ -154,7 +154,7 @@ class Server(object): ...@@ -154,7 +154,7 @@ class Server(object):
except (OSError, IOError): except (OSError, IOError):
continue continue
t = threading.Thread(target=self.handle_request, args=(c,)) t = threading.Thread(target=self.handle_request, args=(c,))
t.set_daemon(True) t.daemon = True
t.start() t.start()
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
pass pass
......
...@@ -99,15 +99,15 @@ class Pool(object): ...@@ -99,15 +99,15 @@ class Pool(object):
args=(self._inqueue, self._outqueue, initializer, initargs) args=(self._inqueue, self._outqueue, initializer, initargs)
) )
self._pool.append(w) self._pool.append(w)
w.set_name(w.get_name().replace('Process', 'PoolWorker')) w.name = w.get_name().replace('Process', 'PoolWorker')
w.set_daemon(True) w.daemon = True
w.start() w.start()
self._task_handler = threading.Thread( self._task_handler = threading.Thread(
target=Pool._handle_tasks, target=Pool._handle_tasks,
args=(self._taskqueue, self._quick_put, self._outqueue, self._pool) args=(self._taskqueue, self._quick_put, self._outqueue, self._pool)
) )
self._task_handler.set_daemon(True) self._task_handler.daemon = True
self._task_handler._state = RUN self._task_handler._state = RUN
self._task_handler.start() self._task_handler.start()
...@@ -115,7 +115,7 @@ class Pool(object): ...@@ -115,7 +115,7 @@ class Pool(object):
target=Pool._handle_results, target=Pool._handle_results,
args=(self._outqueue, self._quick_get, self._cache) args=(self._outqueue, self._quick_get, self._cache)
) )
self._result_handler.set_daemon(True) self._result_handler.daemon = True
self._result_handler._state = RUN self._result_handler._state = RUN
self._result_handler.start() self._result_handler.start()
......
...@@ -619,11 +619,17 @@ class _TestCondition(BaseTestCase): ...@@ -619,11 +619,17 @@ class _TestCondition(BaseTestCase):
woken = self.Semaphore(0) woken = self.Semaphore(0)
p = self.Process(target=self.f, args=(cond, sleeping, woken)) p = self.Process(target=self.f, args=(cond, sleeping, woken))
p.set_daemon(True) try:
p.set_daemon(True)
except AttributeError:
p.daemon = True
p.start() p.start()
p = threading.Thread(target=self.f, args=(cond, sleeping, woken)) p = threading.Thread(target=self.f, args=(cond, sleeping, woken))
p.set_daemon(True) try:
p.set_daemon(True)
except AttributeError:
p.daemon = True
p.start() p.start()
# wait for both children to start sleeping # wait for both children to start sleeping
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment